r2241 - in glibc-package/branches/glibc-2.6/debian: . patches patches/any
Author: schizo
Date: 2007-05-20 00:17:11 +0000 (Sun, 20 May 2007)
New Revision: 2241
Removed:
glibc-package/branches/glibc-2.6/debian/patches/any/cvs-zdump-64-bit.diff
Modified:
glibc-package/branches/glibc-2.6/debian/changelog
glibc-package/branches/glibc-2.6/debian/patches/series
Log:
- Remove any/cvs-zdump-64-bit.diff (obsolete).
Modified: glibc-package/branches/glibc-2.6/debian/changelog
===================================================================
--- glibc-package/branches/glibc-2.6/debian/changelog 2007-05-20 00:08:48 UTC (rev 2240)
+++ glibc-package/branches/glibc-2.6/debian/changelog 2007-05-20 00:17:11 UTC (rev 2241)
@@ -30,7 +30,7 @@
- Disable any/cvs-lt-update.diff (broken).
- Remove any/cvs-realpath.diff (obsolete).
- Remove any/cvs-vfprintf-stack-smashing.diff (obsolete).
- - Disable any/cvs-zdump-64-bit.diff (broken).
+ - Remove any/cvs-zdump-64-bit.diff (obsolete).
- Disable any/local-ldso-disable-hwcap.diff (broken).
- Disable any/submitted-gethostbyname_r.diff (broken).
- Remove any/submitted-iconv-colon.diff (merged upstream).
Deleted: glibc-package/branches/glibc-2.6/debian/patches/any/cvs-zdump-64-bit.diff
===================================================================
--- glibc-package/branches/glibc-2.6/debian/patches/any/cvs-zdump-64-bit.diff 2007-05-20 00:08:48 UTC (rev 2240)
+++ glibc-package/branches/glibc-2.6/debian/patches/any/cvs-zdump-64-bit.diff 2007-05-20 00:17:11 UTC (rev 2241)
@@ -1,37 +0,0 @@
-Fix for 64-bit architectures.
-
-===================================================================
-RCS file: /cvs/glibc/libc/timezone/zdump.c,v
-retrieving revision 1.14
-retrieving revision 1.15
-diff -u -r1.14 -r1.15
---- libc/timezone/zdump.c 2006/09/21 03:57:30 1.14
-+++ libc/timezone/zdump.c 2006/11/11 02:04:43 1.15
-@@ -418,14 +414,21 @@
- }
- } else if (0 > (time_t) -1) {
- /*
-- ** time_t is signed.
-+ ** time_t is signed. Assume overflow wraps around.
- */
-- register time_t hibit;
-+ time_t t = 0;
-+ time_t t1 = 1;
-
-- for (hibit = 1; (hibit * 2) != 0; hibit *= 2)
-- continue;
-- absolute_min_time = hibit;
-- absolute_max_time = -(hibit + 1);
-+ while (t < t1) {
-+ t = t1;
-+ t1 = 2 * t1 + 1;
-+ }
-+
-+ absolute_max_time = t;
-+ t = -t;
-+ absolute_min_time = t - 1;
-+ if (t < absolute_min_time)
-+ absolute_min_time = t;
- } else {
- /*
- ** time_t is unsigned.
Modified: glibc-package/branches/glibc-2.6/debian/patches/series
===================================================================
--- glibc-package/branches/glibc-2.6/debian/patches/series 2007-05-20 00:08:48 UTC (rev 2240)
+++ glibc-package/branches/glibc-2.6/debian/patches/series 2007-05-20 00:17:11 UTC (rev 2241)
@@ -93,7 +93,6 @@
#any/cvs-printf_fp-c.diff -p1
#any/cvs-itoa-c.diff -p1
#any/cvs-lt-update.diff -p0
-#any/cvs-zdump-64-bit.diff -p1
any/local-notls.diff -p0
any/local-asserth-decls.diff -p0
#any/local-base.diff -p0 # g: suspended
Reply to: