Backport of r121819.

svn path=/branches/mono-2-2/mcs/; revision=121820

diff --git a/mcs/class/Mono.Web/Mono.Web.Util/ChangeLog b/mcs/class/Mono.Web/Mono.Web.Util/ChangeLog
index a70359afc18cb981e85b85c0a41ea67b7c4b00b6..1fdab9285eabfd934d68bbceb9e971b4a26e03ae 100644 (file)
--- a/mcs/class/Mono.Web/Mono.Web.Util/ChangeLog
+++ b/mcs/class/Mono.Web/Mono.Web.Util/ChangeLog
@@ -1,3 +1,8 @@
+2008-12-19  Marek Habersack  <mhabersack@novell.com>
+
+       * SettingsMappingManager.cs: make sure _runningOnWindows is set
+       correctly on MacOS/X.
+
 2008-09-18  Marek Habersack  <mhabersack@novell.com>
 
        * SettingsMappingManager.cs: take care of a small race condition

diff --git a/mcs/class/Mono.Web/Mono.Web.Util/SettingsMappingManager.cs b/mcs/class/Mono.Web/Mono.Web.Util/SettingsMappingManager.cs
index 6f878b321a3983bd48f2208be181a9b279521aa5..bbb50085c30885977e9757298191693b5776d101 100644 (file)
--- a/mcs/class/Mono.Web/Mono.Web.Util/SettingsMappingManager.cs
+++ b/mcs/class/Mono.Web/Mono.Web.Util/SettingsMappingManager.cs
@@ -70,7 +70,7 @@ namespace Mono.Web.Util
                {
                        _mappingFile = Path.Combine (Path.GetDirectoryName (RuntimeEnvironment.SystemConfigurationFile), settingsMapFileName);
                        PlatformID pid = Environment.OSVersion.Platform;
-                       _runningOnWindows = ((int) pid != 128 && (int) pid != 4);
+                       _runningOnWindows = ((int) pid != 128 && (int) pid != 4 && (int) pid != 6);
 
                }