From 0fdca23e1e7a5ba312aa32319c8e18997c86f853 Mon Sep 17 00:00:00 2001 From: christos Date: Thu, 4 Apr 2019 22:03:23 +0000 Subject: [PATCH] deal with zic that's not part of libc. --- lib/libc/time/private.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/lib/libc/time/private.h b/lib/libc/time/private.h index f29fdd1d52ef..830750ad5b1d 100644 --- a/lib/libc/time/private.h +++ b/lib/libc/time/private.h @@ -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 @@ char *ctime_r(time_t const *, char *); ((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 @@ void tzset_unlocked(void); #ifdef _REENTRANT extern rwlock_t __lcl_lock; #endif +#endif #endif /* !defined PRIVATE_H */