[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH] mktime: simplify in prep for glibc merge
From: |
Paul Eggert |
Subject: |
[PATCH] mktime: simplify in prep for glibc merge |
Date: |
Sun, 9 Sep 2018 08:57:22 -0700 |
* lib/mktime.c, lib/timegm.c [_LIBC]:
Include mktime-internal.h (a small file just for glibc)
instead of using a typedef.
---
ChangeLog | 7 +++++++
lib/mktime.c | 6 +-----
lib/timegm.c | 6 +-----
3 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 8d6f99f53..b8e7ec905 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2018-09-09 Paul Eggert <address@hidden>
+
+ 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 <address@hidden>
intprops: minor clarification of code
diff --git a/lib/mktime.c b/lib/mktime.c
index 1a332e14a..4ff74901e 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 71276bbe0..229fff23c 100644
--- a/lib/timegm.c
+++ b/lib/timegm.c
@@ -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)
--
2.17.1
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [PATCH] mktime: simplify in prep for glibc merge,
Paul Eggert <=