Improved support for TimeZoneInfo under windows.

When cross compiling with gcc, LIBC is defined and
thus never checks the registry for the timezone information.

This change is released under the MIT license.

diff --git a/mcs/class/System.Core/System/TimeZoneInfo.cs b/mcs/class/System.Core/System/TimeZoneInfo.cs
index 354b47a2a064188a19b2a44c4d31f1dec64308c9..9e169efc579d5157f5e27c62284137072d99aacc 100644 (file)
--- a/mcs/class/System.Core/System/TimeZoneInfo.cs
+++ b/mcs/class/System.Core/System/TimeZoneInfo.cs
@@ -116,7 +116,14 @@ namespace System
                        using (Stream stream = GetMonoTouchData (null)) {
                                return BuildFromStream ("Local", stream);
                        }
-#elif LIBC
+#else
+                       if (IsWindows && LocalZoneKey != null) {
+                               string name = (string)LocalZoneKey.GetValue ("TimeZoneKeyName");
+                               name = TrimSpecial (name);
+                               if (name != null)
+                                       return TimeZoneInfo.FindSystemTimeZoneById (name);
+                       }
+
                        var tz = Environment.GetEnvironmentVariable ("TZ");
                        if (tz != null) {
                                if (tz == String.Empty)
@@ -137,15 +144,6 @@ namespace System
                                        return null;
                                }
                        }
-#else
-                       if (IsWindows && LocalZoneKey != null) {
-                               string name = (string)LocalZoneKey.GetValue ("TimeZoneKeyName");
-                               name = TrimSpecial (name);
-                               if (name != null)
-                                       return TimeZoneInfo.FindSystemTimeZoneById (name);
-                       }
-
-                       return null;
 #endif
                }