Merge pull request #820 from brendanzagaeski/master

[mono.git] / mcs / class / corlib / System / Environment.cs

diff --git a/mcs/class/corlib/System/Environment.cs b/mcs/class/corlib/System/Environment.cs
index a254006c6988558dabadfddcf33d54fd47577807..13d63ccc129d66740dc1148e997d36aa5b2b7d46 100644 (file)
--- a/mcs/class/corlib/System/Environment.cs
+++ b/mcs/class/corlib/System/Environment.cs
@@ -56,7 +56,7 @@ namespace System {
                 * of icalls, do not require an increment.
                 */
 #pragma warning disable 169
-               private const int mono_corlib_version = 110;
+               private const int mono_corlib_version = 111;
 #pragma warning restore 169
 
                [ComVisible (true)]
@@ -531,10 +531,10 @@ namespace System {
                                                        string path = line.Substring (delim_index + 1).Trim ('"');
                                                        bool relative = false;
                                                        
-                                                       if (path.StartsWith ("$HOME/")) {
+                                                       if (path.StartsWithOrdinalUnchecked ("$HOME/")) {
                                                                relative = true;
                                                                path = path.Substring (6);
-                                                       } else if (!path.StartsWith ("/")) {
+                                                       } else if (!path.StartsWithOrdinalUnchecked ("/")) {
                                                                relative = true;
                                                        }
                                                        
@@ -870,10 +870,14 @@ namespace System {
                }
 
                // private methods
-
+#if MOBILE 
+               internal const bool IsRunningOnWindows = false;
+#else
                internal static bool IsRunningOnWindows {
                        get { return ((int) Platform < 4); }
                }
+#endif
+
 #if !NET_2_1
                //
                // Used by gacutil.exe