2010-02-12 Miguel de Icaza <miguel@novell.com>

	* XmlWriterSettings.cs: Expose NamespaceHandling in NET 4.0

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

diff --git a/mcs/class/System.XML/System.Xml/ChangeLog b/mcs/class/System.XML/System.Xml/ChangeLog
index d2ffc641a02de6cbdebc71d7adc8112f96350206..9569df8a7ec8bebafa13aefd147607cce2f2288e 100644 (file)
--- a/mcs/class/System.XML/System.Xml/ChangeLog
+++ b/mcs/class/System.XML/System.Xml/ChangeLog
@@ -1,3 +1,7 @@
+2010-02-12  Miguel de Icaza  <miguel@novell.com>
+
+       * XmlWriterSettings.cs: Expose NamespaceHandling in NET 4.0 
+
 2010-01-28  Atsushi Enomoto  <atsushi@ximian.com>
 
        * XmlReaderBinarySupport.cs : eliminate possible extra buffer

diff --git a/mcs/class/System.XML/System.Xml/NamespaceHandling.cs b/mcs/class/System.XML/System.Xml/NamespaceHandling.cs
index b305cf1e8cd07bc9964e24e44bc735d384c3cfc3..0ede19d0b42cb8ab81e7c611ce07ba36c624eab2 100644 (file)
--- a/mcs/class/System.XML/System.Xml/NamespaceHandling.cs
+++ b/mcs/class/System.XML/System.Xml/NamespaceHandling.cs
@@ -24,7 +24,7 @@
 namespace System.Xml {
 
        [Flags]
-#if NET_2_1
+#if NET_2_1 || NET_4_0
        public
 #else
        internal

diff --git a/mcs/class/System.XML/System.Xml/XmlWriterSettings.cs b/mcs/class/System.XML/System.Xml/XmlWriterSettings.cs
index be365f22a275ec8d80fb654d8abf5e466f27fa5a..90d66534fae5a1fd9f57aa28b68c1e60da8879fd 100644 (file)
--- a/mcs/class/System.XML/System.Xml/XmlWriterSettings.cs
+++ b/mcs/class/System.XML/System.Xml/XmlWriterSettings.cs
@@ -146,7 +146,7 @@ namespace System.Xml
                        //set { outputMethod = value; }
                }
 
-#if NET_2_1 && !MONOTOUCH
+#if (NET_2_1 || NET_4_0) && !MONOTOUCH
                public
 #else
                internal