use MOONLIGHT symbol

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

diff --git a/mcs/class/corlib/System.Diagnostics/ChangeLog b/mcs/class/corlib/System.Diagnostics/ChangeLog
index 5f89d64130f73e3b037047b7fdaa9f66357fd4ca..e30a01a1843a16044f7c7931e8124d77cfa96690 100644 (file)
--- a/mcs/class/corlib/System.Diagnostics/ChangeLog
+++ b/mcs/class/corlib/System.Diagnostics/ChangeLog
@@ -1,3 +1,8 @@
+2010-03-16  Jb Evain  <jbevain@novell.com>
+
+       * StackFrame.cs: use MOONLIGHT symbol to disambiguate
+       MonoTouch and Moonlight code.
+
 2010-03-07 Rodrigo Kumpera  <rkumpera@novell.com>
 
        * Debugger.cs: Add Obsolete attribute to .ctor().

diff --git a/mcs/class/corlib/System.Diagnostics/StackFrame.cs b/mcs/class/corlib/System.Diagnostics/StackFrame.cs
index 38796071e9e90aaabb7bb192b8e1c160120f2e82..8d9c83f7368a390dda37f18202c0542be5e9605e 100644 (file)
--- a/mcs/class/corlib/System.Diagnostics/StackFrame.cs
+++ b/mcs/class/corlib/System.Diagnostics/StackFrame.cs
@@ -140,7 +140,7 @@ namespace System.Diagnostics {
                        string filename = "<filename unknown>";
                        if (fileName == null)
                                return filename;
-#if !NET_2_1 || MONOTOUCH
+#if !MOONLIGHT
                        try {
                                filename = GetFileName ();
                        }

diff --git a/mcs/class/corlib/System.Resources/ChangeLog b/mcs/class/corlib/System.Resources/ChangeLog
index 4b0fe5e655905f39911a7c54ba0d7e73bfd301d8..6027a5bd4fb4a3a95b01be66da85110f666e824c 100644 (file)
--- a/mcs/class/corlib/System.Resources/ChangeLog
+++ b/mcs/class/corlib/System.Resources/ChangeLog
@@ -1,3 +1,8 @@
+2010-03-16  Jb Evain  <jbevain@novell.com>
+
+       * ResourceManager.cs: use MOONLIGHT symbol to disambiguate
+       MonoTouch and Moonlight code.
+
 2010-03-01  Miguel de Icaza  <miguel@novell.com>
 
        * Win32Resources.cs: Prevent infinite loops if the resource that

diff --git a/mcs/class/corlib/System.Resources/ResourceManager.cs b/mcs/class/corlib/System.Resources/ResourceManager.cs
index 58c87fee00e2967e7800f41328f66e795ff0b378..c0979a045a3e1f1aef4b98b136243d33234c1ac1 100644 (file)
--- a/mcs/class/corlib/System.Resources/ResourceManager.cs
+++ b/mcs/class/corlib/System.Resources/ResourceManager.cs
@@ -281,7 +281,7 @@ namespace System.Resources
 
                private string GetResourceFilePath (CultureInfo culture)
                {
-#if !NET_2_1 || MONOTOUCH
+#if !MOONLIGHT
                        if (resourceDir != null)
                                return Path.Combine (resourceDir, GetResourceFileName (culture));
                        else

diff --git a/mcs/class/corlib/System.Runtime.Serialization.Formatters.Binary/BinaryCommon.cs b/mcs/class/corlib/System.Runtime.Serialization.Formatters.Binary/BinaryCommon.cs
index e8338d99d22017e97da8712856473e3a73019e65..ffe5b4320df8081c106ae61ecf9458606173de92 100644 (file)
--- a/mcs/class/corlib/System.Runtime.Serialization.Formatters.Binary/BinaryCommon.cs
+++ b/mcs/class/corlib/System.Runtime.Serialization.Formatters.Binary/BinaryCommon.cs
@@ -81,7 +81,7 @@ namespace System.Runtime.Serialization.Formatters.Binary
 
                        // TimeStamp does not have a TypeCode, so it is managed as a special
                        // case in GetTypeCode()
-#if !NET_2_1 || MONOTOUCH
+#if !MOONLIGHT
                        // This environment variable is only for test and benchmarking purposes.
                        // By default, mono will always use IL generated class serializers.
                        string s = Environment.GetEnvironmentVariable("MONO_REFLECTION_SERIALIZER");

diff --git a/mcs/class/corlib/System.Runtime.Serialization.Formatters.Binary/ChangeLog b/mcs/class/corlib/System.Runtime.Serialization.Formatters.Binary/ChangeLog
index 3975be4a7ecdb09136a9928055521b22384aaf27..510fe781b7ef312ac4e0f104f8c218760aa8fdcd 100644 (file)
--- a/mcs/class/corlib/System.Runtime.Serialization.Formatters.Binary/ChangeLog
+++ b/mcs/class/corlib/System.Runtime.Serialization.Formatters.Binary/ChangeLog
@@ -1,3 +1,8 @@
+2010-03-16  Jb Evain  <jbevain@novell.com>
+
+       * BinaryCommon.cs: use MOONLIGHT symbol to disambiguate
+       MonoTouch and Moonlight code.
+
 2010-02-26  Robert Jordan  <robertj@gmx.net>
 
        * ObjectReader.cs (ReadType, GetDeserializationType):