diff options
author | wollman <wollman@FreeBSD.org> | 1999-01-21 17:22:59 +0000 |
---|---|---|
committer | wollman <wollman@FreeBSD.org> | 1999-01-21 17:22:59 +0000 |
commit | eb63a8058f661b6501ad66d148ede682ec3c7ca9 (patch) | |
tree | d1ca153fcab31c4db9b282be4abde93b0da2271a /lib/libc/stdtime/tzfile.h | |
parent | 78cf17718823a5a0f70549acd4e7c7cd8b209fbb (diff) | |
download | FreeBSD-src-eb63a8058f661b6501ad66d148ede682ec3c7ca9.zip FreeBSD-src-eb63a8058f661b6501ad66d148ede682ec3c7ca9.tar.gz |
Merge from vendor branch: timezone file structure changes and doco.
Fix localtime.c to deal with new magic number field.
Obtained from: ftp://elsie.nci.nih.gov/pub/tzcode1999a.tar.gz
Diffstat (limited to 'lib/libc/stdtime/tzfile.h')
-rw-r--r-- | lib/libc/stdtime/tzfile.h | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/lib/libc/stdtime/tzfile.h b/lib/libc/stdtime/tzfile.h index 58cdc3d..c1b27ea 100644 --- a/lib/libc/stdtime/tzfile.h +++ b/lib/libc/stdtime/tzfile.h @@ -4,7 +4,7 @@ /* ** This file is in the public domain, so clarified as of -** June 5, 1996 by Arthur David Olson (arthur_david_olson@nih.gov). +** 1996-06-05 by Arthur David Olson (arthur_david_olson@nih.gov). */ /* @@ -22,7 +22,7 @@ #ifndef lint #ifndef NOID /* -static char tzfilehid[] = "@(#)tzfile.h 7.8"; +static char tzfilehid[] = "@(#)tzfile.h 7.14"; */ #endif /* !defined NOID */ #endif /* !defined lint */ @@ -47,8 +47,11 @@ static char tzfilehid[] = "@(#)tzfile.h 7.8"; ** Each file begins with. . . */ +#define TZ_MAGIC "TZif" + struct tzhead { - char tzh_reserved[20]; /* 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 */ @@ -63,7 +66,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 @@ -76,7 +79,7 @@ struct tzhead { ** if absent, transition times are ** assumed to be wall clock time ** tzh_ttisgmtcnt (char)s indexed by type; if TRUE, transition -** time is GMT, if FALSE, +** time is UTC, if FALSE, ** transition time is local time ** if absent, transition times are ** assumed to be local time |