]> Savannah Git Hosting - gnulib.git/commitdiff
mktime: simplify in prep for glibc merge
authorPaul Eggert <eggert@cs.ucla.edu>
Sun, 9 Sep 2018 15:56:15 +0000 (08:56 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Sun, 9 Sep 2018 15:57:09 +0000 (08:57 -0700)
* lib/mktime.c, lib/timegm.c [_LIBC]:
Include mktime-internal.h (a small file just for glibc)
instead of using a typedef.

ChangeLog
lib/mktime.c
lib/timegm.c

index 8d6f99f53a2ae7b047690c22f41803d5f1fc9160..b8e7ec9051fa8787ba7a1f59caecbc61f7213c00 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2018-09-09  Paul Eggert  <eggert@cs.ucla.edu>
+
+       mktime: simplify in prep for glibc merge
+       * lib/mktime.c, lib/timegm.c [_LIBC]:
+       Include mktime-internal.h (a small file just for glibc)
+       instead of using a typedef.
+
 2018-09-07  Paul Eggert  <eggert@cs.ucla.edu>
 
        intprops: minor clarification of code
index 1a332e14aa0bab4127cb54ea509858040de8f627..4ff74901e44080540e270ddb3d260921011bcedc 100644 (file)
 # define NEED_MKTIME_WORKING DEBUG_MKTIME
 #endif
 
-#ifdef _LIBC
-typedef long int mktime_offset_t;
-#else
-# include "mktime-internal.h"
-#endif
+#include "mktime-internal.h"
 
 #ifndef _LIBC
 static void
index 71276bbe0ba5d8a318107c0c35519beda7ac37e4..229fff23c6aa593e578aa323f783a3a3e1e4b3d5 100644 (file)
 
 #include <time.h>
 
-#ifdef _LIBC
-typedef long int mktime_offset_t;
-#else
-# include "mktime-internal.h"
-#endif
+#include "mktime-internal.h"
 
 time_t
 timegm (struct tm *tmp)