From: Chris Toshok <toshok@novell.com>
Date: Wed, 1 Feb 2006 20:13:24 +0000 (-0000)
Subject: 2006-02-01  Chris Toshok  <toshok@ximian.com>
X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=commitdiff_plain;h=0e8098088dd4bda6578975a9b0f494868d2c1bce;p=mono.git

2006-02-01  Chris Toshok  <toshok@ximian.com>

	* CompilerCollection.cs: CONFIGURATION_2_0 => NET_2_0.

	* CompilationConfigurationHandler.cs: same.

	* Compiler.cs: same.

	* CompilationConfiguration.cs: same.


svn path=/trunk/mcs/; revision=56416
---

diff --git a/mcs/class/System.Web/System.Web.Configuration/ChangeLog b/mcs/class/System.Web/System.Web.Configuration/ChangeLog
index e661f1e3c30..7e310daf906 100644
--- a/mcs/class/System.Web/System.Web.Configuration/ChangeLog
+++ b/mcs/class/System.Web/System.Web.Configuration/ChangeLog
@@ -1,3 +1,13 @@
+2006-02-01  Chris Toshok  <toshok@ximian.com>
+
+	* CompilerCollection.cs: CONFIGURATION_2_0 => NET_2_0.
+
+	* CompilationConfigurationHandler.cs: same.
+
+	* Compiler.cs: same.
+
+	* CompilationConfiguration.cs: same.
+
 2006-01-08  Konstantin Triger <kostat@mainsoft.com>
 
         * HttpCapabilitiesBase.cs: TARGET_JVM changes to let the compilation
diff --git a/mcs/class/System.Web/System.Web.Configuration/CompilationConfiguration.cs b/mcs/class/System.Web/System.Web.Configuration/CompilationConfiguration.cs
index 29b54eeeff2..0d193a46083 100644
--- a/mcs/class/System.Web/System.Web.Configuration/CompilationConfiguration.cs
+++ b/mcs/class/System.Web/System.Web.Configuration/CompilationConfiguration.cs
@@ -133,7 +133,7 @@ namespace System.Web.Configuration
 			num_recompiles_before_app_restart = parent.num_recompiles_before_app_restart;
 			strict = parent.strict;
 			temp_directory = parent.temp_directory;
-#if CONFIGURATION_2_0
+#if NET_2_0
 			compilers = new CompilerCollection ();
 #else
 			compilers = new CompilerCollection (parent.compilers);
diff --git a/mcs/class/System.Web/System.Web.Configuration/CompilationConfigurationHandler.cs b/mcs/class/System.Web/System.Web.Configuration/CompilationConfigurationHandler.cs
index 6baef7ae2c6..2145a56912b 100644
--- a/mcs/class/System.Web/System.Web.Configuration/CompilationConfigurationHandler.cs
+++ b/mcs/class/System.Web/System.Web.Configuration/CompilationConfigurationHandler.cs
@@ -99,7 +99,7 @@ namespace System.Web.Configuration
 				compiler.Type = AttValue ("type", child);
 				compiler.CompilerOptions = AttValue ("compilerOptions", child, true, true);
 				compiler.WarningLevel = AttUIntValue ("warningLevel", child, 0);
-#if CONFIGURATION_2_0
+#if NET_2_0
 				config.Compilers.Add (compiler);
 #else
 				config.Compilers [compiler.Language] = compiler;
diff --git a/mcs/class/System.Web/System.Web.Configuration/Compiler.cs b/mcs/class/System.Web/System.Web.Configuration/Compiler.cs
index 3d552295ff1..5aa29a50cd0 100644
--- a/mcs/class/System.Web/System.Web.Configuration/Compiler.cs
+++ b/mcs/class/System.Web/System.Web.Configuration/Compiler.cs
@@ -28,7 +28,8 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if !CONFIGURATION_2_0
+#if !NET_2_0
+/* when NET_2_0 is defined, this class is found in System.Web.Configuration_2.0/ */
 
 using System;
 using System.CodeDom.Compiler;
@@ -37,9 +38,6 @@ using System.Configuration;
 
 namespace System.Web.Configuration
 {
-#if NET_2_0
-	public
-#endif
 	class Compiler
 	{
 		public string Language;
diff --git a/mcs/class/System.Web/System.Web.Configuration/CompilerCollection.cs b/mcs/class/System.Web/System.Web.Configuration/CompilerCollection.cs
index 4b6f076d2a1..78a619b9226 100644
--- a/mcs/class/System.Web/System.Web.Configuration/CompilerCollection.cs
+++ b/mcs/class/System.Web/System.Web.Configuration/CompilerCollection.cs
@@ -28,7 +28,8 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if !CONFIGURATION_2_0
+#if !NET_2_0
+/* when NET_2_0 is defined, this class is found in System.Web.Configuration_2.0/ */
 
 using System;
 using System.Collections;
@@ -36,9 +37,6 @@ using System.Configuration;
 
 namespace System.Web.Configuration
 {
-#if NET_2_0
-	public
-#endif
 	sealed class CompilerCollection
 	{
 		Hashtable compilers;
@@ -75,4 +73,5 @@ namespace System.Web.Configuration
 		}
 	}
 }
+
 #endif
diff --git a/mcs/class/System.Web/System.Web.Configuration/WebConfigurationSettings.cs b/mcs/class/System.Web/System.Web.Configuration/WebConfigurationSettings.cs
index 81584de3b8b..10fe34fb3ea 100644
--- a/mcs/class/System.Web/System.Web.Configuration/WebConfigurationSettings.cs
+++ b/mcs/class/System.Web/System.Web.Configuration/WebConfigurationSettings.cs
@@ -811,7 +811,7 @@ namespace System.Web.Configuration
 				ThrowException ("sectionGroup must have a 'name' attribute.", reader);
 
 			string value = null;
-#if CONFIGURATION_2_0
+#if NET_2_0
 			do {
 				if (reader.Name == "name") {
 					if (value != null)