Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/lib/libc/time deal with zic that's not part of libc.



details:   https://anonhg.NetBSD.org/src/rev/761cd15406b5
branches:  trunk
changeset: 998005:761cd15406b5
user:      christos <christos%NetBSD.org@localhost>
date:      Thu Apr 04 22:03:23 2019 +0000

description:
deal with zic that's not part of libc.

diffstat:

 lib/libc/time/private.h |  7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diffs (36 lines):

diff -r a3ff57a33932 -r 761cd15406b5 lib/libc/time/private.h
--- a/lib/libc/time/private.h   Thu Apr 04 22:02:06 2019 +0000
+++ b/lib/libc/time/private.h   Thu Apr 04 22:03:23 2019 +0000
@@ -1,6 +1,6 @@
 /* Private header for tzdb code.  */
 
-/*     $NetBSD: private.h,v 1.54 2019/04/04 19:27:28 christos Exp $    */
+/*     $NetBSD: private.h,v 1.55 2019/04/04 22:03:23 christos Exp $    */
 
 #ifndef PRIVATE_H
 #define PRIVATE_H
@@ -16,8 +16,6 @@
 #include "nbtool_config.h"
 #endif
 
-#include "reentrant.h"
-
 /*
 ** This file is in the public domain, so clarified as of
 ** 1996-06-05 by Arthur David Olson.
@@ -779,6 +777,8 @@
   ((int_fast64_t) YEARSPERREPEAT * (int_fast64_t) AVGSECSPERYEAR)
 #define SECSPERREPEAT_BITS     34      /* ceil(log2(SECSPERREPEAT)) */
 
+#ifdef _LIBC
+#include "reentrant.h"
 extern struct __state *__lclptr;
 #if defined(__LIBC12_SOURCE__)
 #define tzset_unlocked __tzset_unlocked
@@ -790,5 +790,6 @@
 #ifdef _REENTRANT
 extern rwlock_t __lcl_lock;
 #endif
+#endif
 
 #endif /* !defined PRIVATE_H */



Home | Main Index | Thread Index | Old Index