Mercurial > gnulib

changeset 39832:8228a72f9f50

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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.
author Paul Eggert <eggert@cs.ucla.edu>
date Sun, 09 Sep 2018 08:56:15 -0700
parents 47cca1921b32
children 4c9d0c898076
files ChangeLog lib/mktime.c lib/timegm.c
diffstat 3 files changed, 9 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Fri Sep 07 17:13:59 2018 -0700
+++ b/ChangeLog	Sun Sep 09 08:56:15 2018 -0700
@@ -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
--- a/lib/mktime.c	Fri Sep 07 17:13:59 2018 -0700
+++ b/lib/mktime.c	Sun Sep 09 08:56:15 2018 -0700
@@ -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
--- a/lib/timegm.c	Fri Sep 07 17:13:59 2018 -0700
+++ b/lib/timegm.c	Sun Sep 09 08:56:15 2018 -0700
@@ -23,11 +23,7 @@
 
 #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)