This is the mail archive of the
libc-alpha@sourceware.org
mailing list for the glibc project.
[PATCH v2 9/9] Fix time/mktime.c and time/gmtime.c for gnulib compatibility
- From: "Albert ARIBAUD (3ADEV)" <albert dot aribaud at 3adev dot fr>
- To: libc-alpha at sourceware dot org
- Date: Thu, 29 Nov 2018 23:10:10 +0100
- Subject: [PATCH v2 9/9] Fix time/mktime.c and time/gmtime.c for gnulib compatibility
- References: <20181129221010.19589-1-albert.aribaud@3adev.fr>
From: Paul Eggert <eggert@cs.ucla.edu>
Tested with 'make check' on x86_64-linux-gnu and i686-linux.gnu.
* time/mktime.c
(__mktime64): Guard weak_alias with #ifdef
(__mktime64): Guard libc_hidden_def with #if _LIBC
(__mktime64): Guard libc_hidden_weak with #if _LIBC
(mktime): Only build when _LIBC is defined
* time/timegm.c:
(timegm): Only build when _LIBC is defined
---
time/mktime.c | 15 +++------------
time/timegm.c | 2 +-
2 files changed, 4 insertions(+), 13 deletions(-)
diff --git a/time/mktime.c b/time/mktime.c
index 6ff68f491a..b09834e47d 100644
--- a/time/mktime.c
+++ b/time/mktime.c
@@ -549,18 +549,14 @@ __mktime64 (struct tm *tp)
return mktime (tp);
# endif
}
-#endif /* _LIBC || NEED_MKTIME_WORKING || NEED_MKTIME_WINDOWS */
-#ifdef weak_alias
weak_alias (__mktime64, __timelocal64)
-#endif
-
-#ifdef _LIBC
libc_hidden_def (__mktime64)
libc_hidden_weak (__timelocal64)
-#endif
-#if __TIMESIZE != 64
+#endif /* _LIBC || NEED_MKTIME_WORKING || NEED_MKTIME_WINDOWS */
+
+#if defined _LIBC && __TIMESIZE != 64
/* The 32-bit-time wrapper. */
time_t
@@ -573,13 +569,8 @@ mktime (struct tm *tp)
return -1;
}
-#ifdef weak_alias
weak_alias (mktime, timelocal)
-#endif
-
-#ifdef _LIBC
libc_hidden_def (mktime)
libc_hidden_weak (timelocal)
-#endif
#endif
diff --git a/time/timegm.c b/time/timegm.c
index 027c1cf575..94dada6b88 100644
--- a/time/timegm.c
+++ b/time/timegm.c
@@ -35,7 +35,7 @@ __timegm64 (struct tm *tmp)
return __mktime_internal (tmp, __gmtime64_r, &gmtime_offset);
}
-#if __TIMESIZE != 64
+#if defined _LIBC && __TIMESIZE != 64
time_t
timegm (struct tm *tmp)
--
2.17.1