Merge the recently-imported tzcode96h distribution (libc portion). The

part that does zic(8)/zdump(8) is still yet to be imported (but the old
zic and zdump will work just fine with these header files and the
data format has not changed).

1 files changed, 9 insertions, 4 deletions

diff --git a/lib/libc/stdtime/tzfile.h b/lib/libc/stdtime/tzfile.h
index 8d996dd..58cdc3d 100644
--- a/lib/libc/stdtime/tzfile.h
+++ b/lib/libc/stdtime/tzfile.h
@@ -1,10 +1,13 @@
-
-
 #ifndef TZFILE_H
 
 #define TZFILE_H
 
 /*
+** This file is in the public domain, so clarified as of
+** June 5, 1996 by Arthur David Olson (arthur_david_olson@nih.gov).
+*/
+
+/*
 ** This header is for use ONLY with the time conversion code.
 ** There is no guarantee that it will remain unchanged,
 ** or that it will remain at all.
@@ -18,7 +21,9 @@
 
 #ifndef lint
 #ifndef NOID
-/*static char	tzfilehid[] = "@(#)tzfile.h	7.6";*/
+/*
+static char	tzfilehid[] = "@(#)tzfile.h	7.8";
+*/
 #endif /* !defined NOID */
 #endif /* !defined lint */
 
@@ -155,7 +160,7 @@ struct tzhead {
 ** that will probably do.
 */
 
-#define isleap(y) ((((y) % 4) == 0 && ((y) % 100) != 0) || ((y) % 400) == 0)
+#define isleap(y) (((y) % 4) == 0 && (((y) % 100) != 0 || ((y) % 400) == 0))
 
 #ifndef USG