[commits] r662 - /fsf/trunk/libc/time/tzfile.c

[eglibc@xxxxxxxxxx]

Author: eglibc
Date: Sun Nov 12 00:01:37 2006
New Revision: 662

Log:
Import glibc-mainline for 2006-11-12

Modified:
    fsf/trunk/libc/time/tzfile.c

Modified: fsf/trunk/libc/time/tzfile.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- fsf/trunk/libc/time/tzfile.c (original)
+++ fsf/trunk/libc/time/tzfile.c Sun Nov 12 00:01:37 2006
@@ -279,7 +279,9 @@
     if (__builtin_expect (type_idxs[i] >=3D num_types, 0))
       goto lose;
 =

-  if (BYTE_ORDER !=3D BIG_ENDIAN || (sizeof (time_t) =3D=3D 8 && trans_wid=
th =3D=3D 4))
+  if ((BYTE_ORDER !=3D BIG_ENDIAN && (sizeof (time_t) =3D=3D 4 || trans_wi=
dth =3D=3D 4))
+      || (BYTE_ORDER =3D=3D BIG_ENDIAN && sizeof (time_t) =3D=3D 8
+	  && trans_width =3D=3D 4))
     {
       /* Decode the transition times, stored as 4-byte integers in
 	 network (big-endian) byte order.  We work from the end of