From e1b7f59d45ecd4a752d220d49aa7da2bcf9e32ed Mon Sep 17 00:00:00 2001 From: Jb Evain Date: Tue, 16 Mar 2010 12:24:55 +0000 Subject: [PATCH] use MOONLIGHT symbol svn path=/trunk/mcs/; revision=153669 --- mcs/class/corlib/System.Diagnostics/ChangeLog | 5 +++++ mcs/class/corlib/System.Diagnostics/StackFrame.cs | 2 +- mcs/class/corlib/System.Resources/ChangeLog | 5 +++++ mcs/class/corlib/System.Resources/ResourceManager.cs | 2 +- .../BinaryCommon.cs | 2 +- .../System.Runtime.Serialization.Formatters.Binary/ChangeLog | 5 +++++ 6 files changed, 18 insertions(+), 3 deletions(-) diff --git a/mcs/class/corlib/System.Diagnostics/ChangeLog b/mcs/class/corlib/System.Diagnostics/ChangeLog index 5f89d64130f..e30a01a1843 100644 --- a/mcs/class/corlib/System.Diagnostics/ChangeLog +++ b/mcs/class/corlib/System.Diagnostics/ChangeLog @@ -1,3 +1,8 @@ +2010-03-16 Jb Evain + + * StackFrame.cs: use MOONLIGHT symbol to disambiguate + MonoTouch and Moonlight code. + 2010-03-07 Rodrigo Kumpera * 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 38796071e9e..8d9c83f7368 100644 --- 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 = ""; 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 4b0fe5e6559..6027a5bd4fb 100644 --- a/mcs/class/corlib/System.Resources/ChangeLog +++ b/mcs/class/corlib/System.Resources/ChangeLog @@ -1,3 +1,8 @@ +2010-03-16 Jb Evain + + * ResourceManager.cs: use MOONLIGHT symbol to disambiguate + MonoTouch and Moonlight code. + 2010-03-01 Miguel de Icaza * 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 58c87fee00e..c0979a045a3 100644 --- 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 e8338d99d22..ffe5b4320df 100644 --- 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 3975be4a7ec..510fe781b7e 100644 --- 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 + + * BinaryCommon.cs: use MOONLIGHT symbol to disambiguate + MonoTouch and Moonlight code. + 2010-02-26 Robert Jordan * ObjectReader.cs (ReadType, GetDeserializationType): -- 2.25.1