]> Savannah Git Hosting - gnulib.git/commitdiff
timegm: desync from glibc for now
authorPaul Eggert <eggert@cs.ucla.edu>
Fri, 4 Oct 2024 16:10:21 +0000 (09:10 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Fri, 4 Oct 2024 16:16:25 +0000 (09:16 -0700)
* config/srclist.txt: Omit time/timegm.c and time/mktime-internal.h
for now, until we can sync glibc from Gnulib.
* lib/mktime-internal.h, lib/timegm.c: Revert autoupdate, going
back to the recent Gnulib-specific version.

ChangeLog
config/srclist.txt
lib/mktime-internal.h
lib/timegm.c

index 4316c1bed4a294f9871493191695cae7e75b167f..d8ec6067da0543f95f1e7e0fd04ddae716230b40 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2024-10-04  Paul Eggert  <eggert@cs.ucla.edu>
+
+       timegm: desync from glibc for now
+       * config/srclist.txt: Omit time/timegm.c and time/mktime-internal.h
+       for now, until we can sync glibc from Gnulib.
+       * lib/mktime-internal.h, lib/timegm.c: Revert autoupdate, going
+       back to the recent Gnulib-specific version.
+
 2024-10-03  Paul Eggert  <eggert@cs.ucla.edu>
 
        mktime: prefer static_assert to verify
index dbf32d524631f8618678b1c85bb1cbd7ea5fa676..173f23edaf57a28ad97028818fa845cfef8ed7ac 100644 (file)
@@ -89,9 +89,9 @@ $LIBCSRC stdlib/tst-stdc_leading_zeros.c      tests/from-glibc
 $LIBCSRC stdlib/tst-stdc_trailing_ones.c       tests/from-glibc
 $LIBCSRC stdlib/tst-stdc_trailing_zeros.c      tests/from-glibc
 #$LIBCSRC sysdeps/generic/eloop-threshold.h    lib
-$LIBCSRC time/timegm.c                 lib
+#$LIBCSRC time/timegm.c                        lib
 #$LIBCSRC time/mktime.c                        lib
-$LIBCSRC time/mktime-internal.h                lib
+#$LIBCSRC time/mktime-internal.h       lib
 
 # \f
 # All below here commented out in forlorn hope of future syncs.
index 0693aaf14028c24ef6c31740f2b033cc9806e13f..3e2848c121042470a9c17e2426496b99231be659 100644 (file)
@@ -71,9 +71,8 @@ typedef int mktime_offset_t;
 #endif
 
 /* Subroutine of mktime.  Return the time_t representation of TP and
-   normalize TP, given that a struct tm * maps to a time_t as performed
-   by FUNC.  Record next guess for localtime-gmtime offset in *OFFSET.  */
-extern __time64_t __mktime_internal (struct tm *tp,
-                                     struct tm *(*func) (__time64_t const *,
-                                                         struct tm *),
+   normalize TP, given that a struct tm * maps to a time_t.  If
+   LOCAL, the mapping is performed by localtime_r, otherwise by gmtime_r.
+   Record next guess for localtime-gmtime offset in *OFFSET.  */
+extern __time64_t __mktime_internal (struct tm *tp, bool local,
                                      mktime_offset_t *offset) attribute_hidden;
index e5cf30c0198520caf5e6ca31df0f45f310122d90..1f1f66c61b84773937fea094dd3bf09d0c40c6c1 100644 (file)
@@ -31,7 +31,7 @@ __timegm64 (struct tm *tmp)
 {
   static mktime_offset_t gmtime_offset;
   tmp->tm_isdst = 0;
-  return __mktime_internal (tmp, __gmtime64_r, &gmtime_offset);
+  return __mktime_internal (tmp, false, &gmtime_offset);
 }
 
 #if defined _LIBC && __TIMESIZE != 64