From: Paul Eggert Date: Sun, 9 Sep 2018 15:56:15 +0000 (-0700) Subject: mktime: simplify in prep for glibc merge X-Git-Tag: v1.0~5431 X-Git-Url: https://gitweb.git.savannah.gnu.org/gitweb/?a=commitdiff_plain;h=8b55a44258e3a217dec66acb8398e7d00059de4b;p=gnulib.git 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. --- diff --git a/ChangeLog b/ChangeLog index 8d6f99f53a..b8e7ec9051 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2018-09-09 Paul Eggert + + 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 intprops: minor clarification of code diff --git a/lib/mktime.c b/lib/mktime.c index 1a332e14aa..4ff74901e4 100644 --- a/lib/mktime.c +++ b/lib/mktime.c @@ -76,11 +76,7 @@ # 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 diff --git a/lib/timegm.c b/lib/timegm.c index 71276bbe0b..229fff23c6 100644 --- a/lib/timegm.c +++ b/lib/timegm.c @@ -23,11 +23,7 @@ #include -#ifdef _LIBC -typedef long int mktime_offset_t; -#else -# include "mktime-internal.h" -#endif +#include "mktime-internal.h" time_t timegm (struct tm *tmp)