Merge in recent changes from the private version of this header distributed

with tzcode.

diff --git a/include/tzfile.h b/include/tzfile.h
index 498f36463270b8346ab334e63ad61ff78160dcb7..e10f0bf82d291f6be0827850abfc921d67d8b30d 100644 (file)
--- a/include/tzfile.h
+++ b/include/tzfile.h
@@ -1,4 +1,4 @@
-/*     $NetBSD: tzfile.h,v 1.5 1998/02/02 21:08:11 perry Exp $ */
+/*     $NetBSD: tzfile.h,v 1.6 1998/07/30 14:11:22 kleink Exp $        */
 
 /*
  * Copyright (c) 1988, 1993
@@ -53,8 +53,12 @@
 ** Each file begins with. . .
 */
 
+#define TZ_MAGIC       "TZif"
+
 struct tzhead {
-       char    tzh_reserved[24];       /* reserved for future use */
+       char    tzh_magic[4];           /* TZ_MAGIC */
+       char    tzh_reserved[16];       /* reserved for future use */
+       char    tzh_ttisgmtcnt[4];      /* coded number of trans. time flags */
        char    tzh_ttisstdcnt[4];      /* coded number of trans. time flags */
        char    tzh_leapcnt[4];         /* coded number of leap seconds */
        char    tzh_timecnt[4];         /* coded number of transition times */
@@ -68,7 +72,7 @@ struct tzhead {
 **     tzh_timecnt (char [4])s         coded transition times a la time(2)
 **     tzh_timecnt (unsigned char)s    types of local time starting at above
 **     tzh_typecnt repetitions of
-**             one (char [4])          coded GMT offset in seconds
+**             one (char [4])          coded UTC offset in seconds
 **             one (unsigned char)     used to set tm_isdst
 **             one (unsigned char)     that's an abbreviation list index
 **     tzh_charcnt (char)s             '\0'-terminated zone abbreviations
@@ -80,6 +84,11 @@ struct tzhead {
 **                                     transition time is wall clock time
 **                                     if absent, transition times are
 **                                     assumed to be wall clock time
+**     tzh_ttisgmtcnt (char)s          indexed by type; if TRUE, transition
+**                                     time is UTC, if FALSE,
+**                                     transition time is wall clock time
+**                                     if absent, transition times are
+**                                     assumed to be local time
 */
 
 /*