Merge pull request #2045 from BillSeurer/timezone
authorMarcos Henrich <marcoshenrich@gmail.com>
Wed, 30 Sep 2015 14:00:15 +0000 (15:00 +0100)
committerMarcos Henrich <marcoshenrich@gmail.com>
Wed, 30 Sep 2015 14:00:15 +0000 (15:00 +0100)
[ppc] Fix exception when reading from timezone file.

mcs/class/corlib/System/TimeZoneInfo.cs

index 12779bbca229c595dc9c0e91681f1c4557d110be..bc27da33976e6ff062adc0905a4fe81ec8e7a008 100644 (file)
@@ -1235,7 +1235,7 @@ namespace System
                        return (((i >> 24) & 0xff)
                                | ((i >> 8) & 0xff00)
                                | ((i << 8) & 0xff0000)
-                               | ((i << 24)));
+                               | (((i & 0xff) << 24)));
                }
 
                static int ReadBigEndianInt32 (byte [] buffer, int start)