Module Name: src
Committed By: christos
Date: Thu Apr 4 22:03:23 UTC 2019
Modified Files:
src/lib/libc/time: private.h
Log Message:
deal with zic that's not part of libc.
To generate a diff of this commit:
cvs rdiff -u -r1.54 -r1.55 src/lib/libc/time/private.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/time/private.h
diff -u src/lib/libc/time/private.h:1.54 src/lib/libc/time/private.h:1.55
--- src/lib/libc/time/private.h:1.54 Thu Apr 4 15:27:28 2019
+++ src/lib/libc/time/private.h Thu Apr 4 18:03:23 2019
@@ -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 */
