use MOONLIGHT symbol

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

diff --git a/mcs/class/corlib/System.IO.IsolatedStorage/ChangeLog b/mcs/class/corlib/System.IO.IsolatedStorage/ChangeLog
index f7d405326aba151c006341f961ffe5f5546e240c..e1ab06e62c78b45fe272371f80d1a54414de8ffb 100644 (file)
--- a/mcs/class/corlib/System.IO.IsolatedStorage/ChangeLog
+++ b/mcs/class/corlib/System.IO.IsolatedStorage/ChangeLog
@@ -1,3 +1,15 @@
+2010-03-16  Jb Evain  <jbevain@novell.com>
+
+       * IsolatedStorageFileEnumerator.cs
+       * MoonIsolatedStorageFileStream.cs
+       * MoonIsolatedStorageFile.cs
+       * MoonIsolatedStorage.cs
+       * IsolatedStorageScope.cs
+       * IsolatedStorageFileStream.cs
+       * IsolatedStorage.cs
+       * IsolatedStorageFile.cs:
+               use MOONLIGHT symbol to disambiguate MonoTouch and Moonlight code.
+
 2009-11-01  Sebastien Pouliot  <sebastien@ximian.com>
 
        * MoonIsolatedStorageFile.cs: Add new CheckSearchPattern 

diff --git a/mcs/class/corlib/System.IO.IsolatedStorage/IsolatedStorage.cs b/mcs/class/corlib/System.IO.IsolatedStorage/IsolatedStorage.cs
index 479e723fbabd327de5c483afc478da124ab258af..fcb24c984fdf585c34fbff4644c6ddf569417be1 100644 (file)
--- a/mcs/class/corlib/System.IO.IsolatedStorage/IsolatedStorage.cs
+++ b/mcs/class/corlib/System.IO.IsolatedStorage/IsolatedStorage.cs
@@ -28,7 +28,7 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if !NET_2_1 || MONOTOUCH
+#if !MOONLIGHT
 using System.Globalization;
 using System.Reflection;
 using System.Runtime.InteropServices;
@@ -153,5 +153,5 @@ namespace System.IO.IsolatedStorage {
                public abstract void Remove ();
        }
 }
-/* NET_2_1 */
+/* MOONLIGHT */
 #endif 
\ No newline at end of file

diff --git a/mcs/class/corlib/System.IO.IsolatedStorage/IsolatedStorageFile.cs b/mcs/class/corlib/System.IO.IsolatedStorage/IsolatedStorageFile.cs
index 00f2494f626a82d9e74bc1009ab4b4f97aada5fc..583231ec13d0cad16609437454ab2891522693b8 100644 (file)
--- a/mcs/class/corlib/System.IO.IsolatedStorage/IsolatedStorageFile.cs
+++ b/mcs/class/corlib/System.IO.IsolatedStorage/IsolatedStorageFile.cs
@@ -27,7 +27,7 @@
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
-#if !NET_2_1 || MONOTOUCH
+#if !MOONLIGHT
 using System.Collections;
 using System.Reflection;
 using System.Runtime.InteropServices;

diff --git a/mcs/class/corlib/System.IO.IsolatedStorage/IsolatedStorageFileEnumerator.cs b/mcs/class/corlib/System.IO.IsolatedStorage/IsolatedStorageFileEnumerator.cs
index 25641e2c7a96c9278cedf431fbba737822e13f3b..08457bff978ea0448ab4dfb942520ab3731bc131 100644 (file)
--- a/mcs/class/corlib/System.IO.IsolatedStorage/IsolatedStorageFileEnumerator.cs
+++ b/mcs/class/corlib/System.IO.IsolatedStorage/IsolatedStorageFileEnumerator.cs
@@ -28,7 +28,7 @@
 
 using System.Collections;
 
-#if !NET_2_1 || MONOTOUCH
+#if !MOONLIGHT
 
 namespace System.IO.IsolatedStorage {
 

diff --git a/mcs/class/corlib/System.IO.IsolatedStorage/IsolatedStorageFileStream.cs b/mcs/class/corlib/System.IO.IsolatedStorage/IsolatedStorageFileStream.cs
index 75d5c74b250dd6bef40e9ba28b15c34eedc60566..4479dab7f3dcfafb916dd078b966106011a3821d 100644 (file)
--- a/mcs/class/corlib/System.IO.IsolatedStorage/IsolatedStorageFileStream.cs
+++ b/mcs/class/corlib/System.IO.IsolatedStorage/IsolatedStorageFileStream.cs
@@ -27,7 +27,7 @@
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
-#if !NET_2_1 || MONOTOUCH
+#if !MOONLIGHT
 using System.Diagnostics;
 using System.Globalization;
 using System.Reflection;

diff --git a/mcs/class/corlib/System.IO.IsolatedStorage/IsolatedStorageScope.cs b/mcs/class/corlib/System.IO.IsolatedStorage/IsolatedStorageScope.cs
index 3e17bcb41f32b54d59218466b67bf708e6a7576d..bde8468ccc8f2ee09efbbe4ffc5bd5c8fea5579c 100644 (file)
--- a/mcs/class/corlib/System.IO.IsolatedStorage/IsolatedStorageScope.cs
+++ b/mcs/class/corlib/System.IO.IsolatedStorage/IsolatedStorageScope.cs
@@ -41,7 +41,7 @@ namespace System.IO.IsolatedStorage {
 
                None = 0,
                User = 1,
-#if NET_2_1 && !MONOTOUCH
+#if MOONLIGHT
                // Available in Silverlight
                Application = 32,
 #else

diff --git a/mcs/class/corlib/System.IO.IsolatedStorage/MoonIsolatedStorage.cs b/mcs/class/corlib/System.IO.IsolatedStorage/MoonIsolatedStorage.cs
index 9698309fef9bdfe29274d66bb6b3ad07d9d606af..9ea31ee08bb3a9feedc2804596c3b63104be2f86 100644 (file)
--- a/mcs/class/corlib/System.IO.IsolatedStorage/MoonIsolatedStorage.cs
+++ b/mcs/class/corlib/System.IO.IsolatedStorage/MoonIsolatedStorage.cs
@@ -26,7 +26,7 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if NET_2_1 && !MONOTOUCH
+#if MOONLIGHT
 
 using System;
 using System.IO;

diff --git a/mcs/class/corlib/System.IO.IsolatedStorage/MoonIsolatedStorageFile.cs b/mcs/class/corlib/System.IO.IsolatedStorage/MoonIsolatedStorageFile.cs
index af4560d712346ac576ea1f36e970bec992643a8a..0c0fe270416bd8036b89ad985dff5e382d012f1f 100644 (file)
--- a/mcs/class/corlib/System.IO.IsolatedStorage/MoonIsolatedStorageFile.cs
+++ b/mcs/class/corlib/System.IO.IsolatedStorage/MoonIsolatedStorageFile.cs
@@ -28,7 +28,7 @@
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
-#if NET_2_1 && !MONOTOUCH
+#if MOONLIGHT
 using System;
 using System.IO;
 using System.Runtime.InteropServices;

diff --git a/mcs/class/corlib/System.IO.IsolatedStorage/MoonIsolatedStorageFileStream.cs b/mcs/class/corlib/System.IO.IsolatedStorage/MoonIsolatedStorageFileStream.cs
index 60d05549487803b1259badd1c0fef72abc6deffd..23b90e52ce774808399a38cd380177afe128ba38 100644 (file)
--- a/mcs/class/corlib/System.IO.IsolatedStorage/MoonIsolatedStorageFileStream.cs
+++ b/mcs/class/corlib/System.IO.IsolatedStorage/MoonIsolatedStorageFileStream.cs
@@ -28,7 +28,7 @@
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
-#if NET_2_1 && !MONOTOUCH
+#if MOONLIGHT
 using System;
 using System.IO;