diff options
| author | Marek Habersack <grendel@twistedcode.net> | 2008-12-19 02:39:25 +0300 |
|---|---|---|
| committer | Marek Habersack <grendel@twistedcode.net> | 2008-12-19 02:39:25 +0300 |
| commit | 01e2b61f4b68fb1f34697402c8fe31620f013330 (patch) | |
| tree | 2cc8d9a3315b626a85ccc0a46e158b654e0d64db /mcs/class/Mono.Web | |
| parent | 154b6ffbb0e256961b896d61723311f3b699f6e6 (diff) | |
2008-12-19 Marek Habersack <mhabersack@novell.com>
* SettingsMappingManager.cs: make sure _runningOnWindows is set
correctly on MacOS/X.
svn path=/trunk/mcs/; revision=121819
Diffstat (limited to 'mcs/class/Mono.Web')
| -rw-r--r-- | mcs/class/Mono.Web/Mono.Web.Util/ChangeLog | 5 | ||||
| -rw-r--r-- | mcs/class/Mono.Web/Mono.Web.Util/SettingsMappingManager.cs | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/mcs/class/Mono.Web/Mono.Web.Util/ChangeLog b/mcs/class/Mono.Web/Mono.Web.Util/ChangeLog index a70359afc18..1fdab9285ea 100644 --- 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 6f878b321a3..bbb50085c30 100644 --- 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); } |