Refine previous change to work with mcs 0.31.

* Consts.cs (UnmanagedType_80): While bootstrapping, refer to new
internal bootstrap-only define in UnmanagedType.

svn path=/trunk/mcs/; revision=30097

diff --git a/mcs/class/corlib/Assembly/ChangeLog b/mcs/class/corlib/Assembly/ChangeLog
index dfe8352694e15b54c3bbc8c87aeb76237091bc5c..9cef278b100231b79ebb6716a5e5e29cc5b5ac69 100644 (file)
--- a/mcs/class/corlib/Assembly/ChangeLog
+++ b/mcs/class/corlib/Assembly/ChangeLog
@@ -1,3 +1,9 @@
+2004-06-22  Raja R Harinath  <rharinath@novell.com>
+
+       Refine previous change to work with mcs 0.31.
+       * Consts.cs (UnmanagedType_80): While bootstrapping, refer to new
+       internal bootstrap-only define in UnmanagedType.
+
 2004-06-18  Raja R Harinath  <rharinath@novell.com>
 
        * Consts.cs (UnmanagedType_80): New constant.  Used to workaround

diff --git a/mcs/class/corlib/Assembly/Consts.cs b/mcs/class/corlib/Assembly/Consts.cs
index 79bca8091405eea3b9ac30ddb6e0fe4151ffccbc..10122f1071172ac09020febf0557d08acb662fd6 100644 (file)
--- a/mcs/class/corlib/Assembly/Consts.cs
+++ b/mcs/class/corlib/Assembly/Consts.cs
@@ -76,5 +76,9 @@ internal sealed class Consts
 
 #endif
 
+#if BOOTSTRAP_WITH_OLDLIB
+       public const UnmanagedType UnmanagedType_80 = UnmanagedType.__mono_bootstrap_NativeTypeMax;
+#else
        public const UnmanagedType UnmanagedType_80 = (UnmanagedType) 80;
+#endif
 }