summaryrefslogtreecommitdiff
path: root/time
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>1997-03-31 22:56:24 +0000
committerUlrich Drepper <drepper@redhat.com>1997-03-31 22:56:24 +0000
commit5929563ff20245bbaa1b3ca2f4bfcee623ac6fb5 (patch)
tree15b1ff0a40462018402078788148c0c99d188429 /time
parent3075e0e37c0e7cc2e6eb518c409e0769d058ed4b (diff)
1997-04-01 00:37 Ulrich Drepper <drepper@cygnus.com> * math/Makefile: Prevent inlining for test-{float,double,longdouble}. * math/libm-test.c (initialize): Make strings unique and force values to memory. * posix/regex.c: Debug debugging code. * sysdeps/i386/asm-syntax.h: Define `L' macro to emit correct syntax for local label. * sysdeps/i386/add_n.S: Use correct local label syntax for the binary format. * sysdeps/i386/addmul_1.S: Likewise. * sysdeps/i386/lshift.S: Likewise. * sysdeps/i386/memchr.S: Likewise. * sysdeps/i386/memset.S: Likewise. * sysdeps/i386/mul_1.S: Likewise. * sysdeps/i386/rshift.S: Likewise. * sysdeps/i386/stpcpy.S: Likewise. * sysdeps/i386/stpncpy.S: Likewise. * sysdeps/i386/strchr.S: Likewise. * sysdeps/i386/strcspn.S: Likewise. * sysdeps/i386/strlen.S: Likewise. * sysdeps/i386/strpbrk.S: Likewise. * sysdeps/i386/strrchr.S: Likewise. * sysdeps/i386/strspn.S: Likewise. * sysdeps/i386/strtok.S: Likewise. * sysdeps/i386/sub_n.S: Likewise. * sysdeps/i386/submul_1.S: Likewise. * sysdeps/i386/i486/strcat.S: Likewise. * sysdeps/i386/i486/strlen.S: Likewise. * sysdeps/i386/i586/add_n.S: Likewise. * sysdeps/i386/i586/addmul_1.S: Likewise. * sysdeps/i386/i586/lshift.S: Likewise. * sysdeps/i386/i586/memset.S: Likewise. * sysdeps/i386/i586/mul_1.S: Likewise. * sysdeps/i386/i586/rshift.S: Likewise. * sysdeps/i386/i586/strchr.S: Likewise. * sysdeps/i386/i586/strlen.S: Likewise. * sysdeps/i386/i586/sub_n.S: Likewise. * sysdeps/i386/i586/submul_1.S: Likewise. * sysdeps/stub/s_log2l.c: Correct function name. * time/africa: Updated from ADO tzdata1997e. * time/aantarctica: Likewise. * time/asia: Likewise. * time/australia: Likewise. * time/europe: Likewise. * time/northamerica: Likewise. * time/southamerica: Likewise. * time/private.h: Updated from ADO tzcode1997d. * time/scheck.c: Likewise. 1997-03-31 12:42 Ulrich Drepper <drepper@cygnus.com> * sysdeps/unix/sysv/linux/powerpc/Dist: Add kernel_*.h files. 1997-03-23 01:41 Geoff Keating <geoffk@ozemail.com.au> * sysdeps/powerpc/strlen.s: Rewrote for more speed. * string/tst-strlen.c: Also test various string alignments. 1997-03-19 06:11 Geoff Keating <geoffk@ozemail.com.au> * sysdeps/unix/sysv/linux/powerpc/statbuf.h: Removed. * sysdeps/unix/sysv/linux/powerpc/kernel_stat.h: Added. * sysdeps/powerpc/dl-machine.h (ELF_PREFERRED_ADDRESS): Assume program base address is 0x01800000 if we can't otherwise tell what it is. (elf_machine_rela): Replace `assertion failed' with real error messages. * sysdeps/powerpc/dl-machine.h: More comments, more GNU indenting. Put in extra parentheses to make explicit the relative precedence of + and >>. * sysdeps/powerpc/bsd-setjmp.S: Add `__setjmp' symbol so the tests pass. * sysdeps/powerpc/clone.S: Rewrite. Probably still doesn't work. * sysdeps/unix/sysv/linux/powerpc/sys/sysdep.h: Use .section "text" instead of .text. 1997-03-31 02:28 Ulrich Drepper <drepper@cygnus.com> * misc/tst-tsearch.c: Don't write to stderr, write to stdout instead. * inet/inet_ntoa.c (inet_ntoa): Complete rewrite. Now uses thread-specific memory in multi-threaded programs. * sysdeps/stub/s_exp2.c: New file. Stub version for exp2 function. * sysdeps/stub/s_exp2f.c: New file. * sysdeps/stub/s_exp2l.c: New file. Reported by a sun <asun@zoology.washington.edu>. * sysdeps/unix/sysv/linux/netatalk/atalk.h: Rename to... * sysdeps/unix/sysv/linux/netatalk/at.h: ...this. Suggested by a sun <asun@zoology.washington.edu>. 1997-03-30 14:53 Ulrich Drepper <drepper@cygnus.com> * sysdeps/unix/sysv/linux/netinet/ip_icmp.h: Add former contents of <netinet/icmp.h>. Patch by a sun <asun@zoology.washington.edu>. * sysdeps/powerpc/strlen.S: Added.
Diffstat (limited to 'time')
-rw-r--r--time/africa18
-rw-r--r--time/antarctica26
-rw-r--r--time/asia91
-rw-r--r--time/australasia21
-rw-r--r--time/europe18
-rw-r--r--time/northamerica8
-rw-r--r--time/private.h15
-rw-r--r--time/scheck.c2
-rw-r--r--time/southamerica9
9 files changed, 114 insertions, 94 deletions
diff --git a/time/africa b/time/africa
index 49f39fbfab..1ac3835056 100644
--- a/time/africa
+++ b/time/africa
@@ -1,4 +1,4 @@
-# @(#)africa 7.16
+# @(#)africa 7.17
# This data is by no means authoritative; if you think you know better,
# go ahead and edit the file (and please send any changes to
@@ -403,8 +403,10 @@ Rule Libya 1986 only - Oct 3 0:00 0 -
Rule Libya 1987 1989 - Apr 1 0:00 1:00 S
Rule Libya 1987 1990 - Oct 1 0:00 0 -
Rule Libya 1990 only - May 4 0:00 1:00 S
-Rule Libya 1996 max - Mar 30 2:00s 1:00 S
-Rule Libya 1996 max - Sep 30 2:00s 0 -
+Rule Libya 1996 only - Mar 30 2:00s 1:00 S
+Rule Libya 1996 only - Sep 30 2:00s 0 -
+Rule Libya 1997 max - Mar lastThu 2:00s 1:00 S
+Rule Libya 1997 max - Oct Thu>=1 2:00s 0 -
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
Zone Africa/Tripoli 0:52:44 - LMT 1920
1:00 Libya CE%sT 1959
@@ -525,9 +527,10 @@ Zone Atlantic/St_Helena -0:22:48 - LMT 1890 # Jamestown
-0:06 - SHT 1951 # St Helena Time (?)
0:00 - GMT
# The other parts of the St Helena territory are similar:
-# Tristan da Cunha: on GMT, says Whitman
-# Ascension: on GMT, says usno1995
-# Gough, Inaccessible, Nightingale: no information, but probably GMT
+# Tristan da Cunha: on GMT, say Whitman and the CIA
+# Ascension: on GMT, says usno1995 and the CIA
+# Gough (scientific station since 1955): on GMT, says the CIA
+# Inaccessible, Nightingale: no information, but probably GMT
# Sao Tome and Principe
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
@@ -577,7 +580,8 @@ Rule SA 1943 1944 - Mar Sun>=15 2:00 0 -
Zone Africa/Johannesburg 1:52:00 - LMT 1892 Feb 8
1:30 - SAT 1903 Mar
2:00 SA SA%sT
-# Prince Edward Is
+# Marion and Prince Edward Is
+# weather station since 1947
# no information
# Sudan
diff --git a/time/antarctica b/time/antarctica
index c06231e454..83f0cfed76 100644
--- a/time/antarctica
+++ b/time/antarctica
@@ -1,8 +1,9 @@
-# @(#)antarctica 7.7
+# @(#)antarctica 7.8
-# From Paul Eggert (1997-01-20):
+# From Paul Eggert (1997-03-28):
# To keep things manageable, we list only locations occupied year-round;
-# see <URL:http://earth.agu.org/amen/nations.html> (1996-05-24).
+# see <URL:http://earth.agu.org/amen/nations.html> (1996-05-24)
+# and <URL:http://www.spri.cam.ac.uk/bob/periant.htm> (1996-09-05).
# Unless otherwise specified, we have no time zone information.
#
# Except for the French entries,
@@ -29,7 +30,7 @@ Rule ChileAQ 1970 max - Mar Sun>=9 0:00 0 -
# 5 others
# Australia - territories
-# Heard Island, McDonald Islands
+# Heard Island, McDonald Islands (uninhabited)
#
# year-round bases
# Casey, Bailey Peninsula, since 1969
@@ -70,9 +71,10 @@ Zone Antarctica/Mawson 0 - ___ 1954 Feb 13
#
# Martin-de-Vivies Base, Amsterdam Island, -374105+0773155, since 1950
# Alfred-Faure Base, Crozet Islands, -462551+0515152, since 1964
-# Port-aux-Francais, Kerguelen Islands, -492110+0701303, since 1951
+# Port-aux-Francais, Kerguelen Islands, -492110+0701303, since 1951;
+# a whaling and sealing station operated 1908-14, 1920-29, and 1951-56
#
-# St Paul Island - near Amsterdam, uninhabited since 1927
+# St Paul Island - near Amsterdam, uninhabited since 1931
#
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
Zone Indian/Kerguelen 0 - ___ 1950 # Port-aux-Francais
@@ -107,8 +109,8 @@ Zone Antarctica/DumontDUrville 0 - ___ 1947
# King Sejong, King George Island, since 1988
# New Zealand - claims
-# Balleny Islands
-# Scott Island
+# Balleny Islands (never inhabited)
+# Scott Island (never inhabited)
#
# year-round base
# Scott, Ross Island, since 1957-01, is like Antarctica/McMurdo.
@@ -124,10 +126,10 @@ Rule NZAQ 1976 1989 - Mar Sun>=1 2:00s 0 S
Rule NZAQ 1990 max - Mar Sun>=15 2:00s 0 S
# Norway - territories
-# Bouvet (uninhabited)
+# Bouvet (never inhabited)
#
# claims
-# Peter I Island (uninhabited)
+# Peter I Island (never inhabited)
# Poland - year-round base
# Arctowski, King George Island, since 1977
@@ -147,7 +149,11 @@ Rule NZAQ 1990 max - Mar Sun>=15 2:00s 0 S
#
# British Antarctic Territories (BAT) claims
# South Orkney Islands
+# scientific station from 1903
+# whaling station at Signy I 1920-1926
# South Shetland Islands
+# whaling station at Deception I 1912-1931
+# scientific station from 1943
#
# year-round bases
# Halley, Coates Land, -7535-2619, since 1956-01-06
diff --git a/time/asia b/time/asia
index 0a3c4fed00..829d40b9a8 100644
--- a/time/asia
+++ b/time/asia
@@ -1,4 +1,4 @@
-# @(#)asia 7.28
+# @(#)asia 7.29
# This data is by no means authoritative; if you think you know better,
# go ahead and edit the file (and please send any changes to
@@ -508,8 +508,6 @@ Rule Zion 1988 only - Sep 3 0:00 0 S
# From Ephraim Silverberg (ephraim@cs.huji.ac.il), 1997-03-04:
-# Zone Information Compiler (ZIC) File for the State of Israel (1989-2009)
-
# According to the Office of the Secretary General of the Ministry of
# Interior, there is NO set rule for Daylight-Savings/Standard time changes.
# Each year they decide anew what havoc to wreak on the country. However,
@@ -525,27 +523,27 @@ Rule Zion 1988 only - Sep 3 0:00 0 S
# change back to standard time took place on Sunday night instead of Saturday
# night to avoid conflicts with the Jewish New Year.
-# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-Rule Zion 1989 only - Apr 30 0:00 1:00 D
-Rule Zion 1989 only - Sep 3 0:00 0:00 S
-Rule Zion 1990 only - Mar 25 0:00 1:00 D
-Rule Zion 1990 only - Aug 26 0:00 0:00 S
-Rule Zion 1991 only - Mar 24 0:00 1:00 D
-Rule Zion 1991 only - Sep 1 0:00 0:00 S
-Rule Zion 1992 only - Mar 29 0:00 1:00 D
-Rule Zion 1992 only - Sep 6 0:00 0:00 S
-Rule Zion 1993 only - Apr 2 0:00 1:00 D
-Rule Zion 1993 only - Sep 5 0:00 0:00 S
+# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
+Rule Zion 1989 only - Apr 30 0:00 1:00 D
+Rule Zion 1989 only - Sep 3 0:00 0 S
+Rule Zion 1990 only - Mar 25 0:00 1:00 D
+Rule Zion 1990 only - Aug 26 0:00 0 S
+Rule Zion 1991 only - Mar 24 0:00 1:00 D
+Rule Zion 1991 only - Sep 1 0:00 0 S
+Rule Zion 1992 only - Mar 29 0:00 1:00 D
+Rule Zion 1992 only - Sep 6 0:00 0 S
+Rule Zion 1993 only - Apr 2 0:00 1:00 D
+Rule Zion 1993 only - Sep 5 0:00 0 S
# The dates for 1994-1995 were obtained from Office of the Spokeswoman for the
# Ministry of Interior, Jerusalem, Israel. The spokeswoman can be reached by
# calling the office directly at 972-2-6701447 or 972-2-6701448.
# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-Rule Zion 1994 only - Apr 1 0:00 1:00 D
-Rule Zion 1994 only - Aug 28 0:00 0:00 S
-Rule Zion 1995 only - Mar 31 0:00 1:00 D
-Rule Zion 1995 only - Sep 3 0:00 0:00 S
+Rule Zion 1994 only - Apr 1 0:00 1:00 D
+Rule Zion 1994 only - Aug 28 0:00 0 S
+Rule Zion 1995 only - Mar 31 0:00 1:00 D
+Rule Zion 1995 only - Sep 3 0:00 0 S
# The dates for 1996 were determined by the Minister of Interior of the
# time, Haim Ramon. The official announcement regarding 1996-1998
@@ -560,40 +558,20 @@ Rule Zion 1995 only - Sep 3 0:00 0:00 S
#
# ftp://ftp.huji.ac.il/pub/tz/announcements/1997.ps.gz
+# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
+Rule Zion 1996 only - Mar 15 0:00 1:00 D
+Rule Zion 1996 only - Sep 16 0:00 0 S
+Rule Zion 1997 only - Mar 21 0:00 1:00 D
+Rule Zion 1997 only - Sep 14 0:00 0 S
+Rule Zion 1998 only - Mar 20 0:00 1:00 D
+Rule Zion 1998 only - Oct 18 0:00 0 S
+
+# From Paul Eggert (1997-03-15):
+# Here are guesses for rules after 1998.
+# They are probably wrong, but they are more likely than no DST at all.
# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-Rule Zion 1996 only - Mar 15 0:00 1:00 D
-Rule Zion 1996 only - Sep 16 0:00 0:00 S
-Rule Zion 1997 only - Mar 21 0:00 1:00 D
-Rule Zion 1997 only - Sep 14 0:00 0:00 S
-Rule Zion 1998 only - Mar 20 0:00 1:00 D
-Rule Zion 1998 only - Oct 18 0:00 0:00 S
-
-# These rules are probably wrong, but they are close approximations (usually
-# within a few weeks):
-
-# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-Rule Zion 1999 only - Apr 11 0:00 1:00 D
-Rule Zion 1999 only - Sep 5 0:00 0:00 S
-Rule Zion 2000 only - Apr 30 0:00 1:00 D
-Rule Zion 2000 only - Sep 24 0:00 0:00 S
-Rule Zion 2001 only - Apr 15 0:00 1:00 D
-Rule Zion 2001 only - Sep 9 0:00 0:00 S
-Rule Zion 2002 only - Apr 7 0:00 1:00 D
-Rule Zion 2002 only - Sep 1 0:00 0:00 S
-Rule Zion 2003 only - Apr 27 0:00 1:00 D
-Rule Zion 2003 only - Sep 21 0:00 0:00 S
-Rule Zion 2004 only - Apr 18 0:00 1:00 D
-Rule Zion 2004 only - Sep 12 0:00 0:00 S
-Rule Zion 2005 only - May 1 0:00 1:00 D
-Rule Zion 2005 only - Sep 25 0:00 0:00 S
-Rule Zion 2006 only - Apr 23 0:00 1:00 D
-Rule Zion 2006 only - Sep 17 0:00 0:00 S
-Rule Zion 2007 only - Apr 15 0:00 1:00 D
-Rule Zion 2007 only - Sep 9 0:00 0:00 S
-Rule Zion 2008 only - Apr 27 0:00 1:00 D
-Rule Zion 2008 only - Sep 21 0:00 0:00 S
-Rule Zion 2009 only - Apr 19 0:00 1:00 D
-Rule Zion 2009 only - Sep 13 0:00 0:00 S
+Rule Zion 1999 max - Mar Fri>=15 0:00 1:00 D
+Rule Zion 1999 max - Sep Sun>=15 0:00 0 S
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
Zone Asia/Jerusalem 2:20:56 - LMT 1880
@@ -810,7 +788,8 @@ Rule Mongol 1985 1990 - Mar lastSun 2:00 1:00 S
Rule Mongol 1985 1990 - Sep lastSun 3:00 0 -
Rule Mongol 1991 max - Mar lastSun 0:00 1:00 S
Rule Mongol 1991 1995 - Sep lastSun 0:00 0 -
-Rule Mongol 1996 max - Oct Fri>=22 0:00 0 -
+Rule Mongol 1996 only - Oct Fri>=22 0:00 0 -
+Rule Mongol 1997 max - Sep lastSun 0:00 0 -
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
#Zone Asia/Dariv 6:14:32 - LMT 1905 Aug
# 6:00 - DART 1978 # Dariv Time
@@ -909,6 +888,11 @@ Zone Asia/Singapore 6:55:24 - LMT 1880
# reported ``the country's standard time will be put forward by one hour at
# midnight Friday (1830 GMT) `in the light of the present power crisis'.''
# Transitions before 1996 are from Shanks (1991).
+#
+# From Dharmasiri Senanayake, Sri Lanka Media Minister (1996-10-24), as quoted
+# in <URL:news:54rka5$m5h@mtinsc01-mgt.ops.worldnet.att.net> (1996-10-26):
+# With effect from 12.30 a.m. on 26th October 1996
+# Sri Lanka will be six (06) hours ahead of GMT.
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
Zone Asia/Colombo 5:19:24 - LMT 1880
@@ -917,7 +901,8 @@ Zone Asia/Colombo 5:19:24 - LMT 1880
5:30 0:30 IHST 1942 Sep
5:30 1:00 IST 1945 Oct 16 2:00
5:30 - IST 1996 May 25 0:00
- 6:30 - LKT # Sri Lanka Time
+ 6:30 - LKT 1996 Oct 26 0:30
+ 6:00 - LKT
# Syria
# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
diff --git a/time/australasia b/time/australasia
index aa6387997e..11b0045a98 100644
--- a/time/australasia
+++ b/time/australasia
@@ -1,4 +1,4 @@
-# @(#)australasia 7.32
+# @(#)australasia 7.33
# This file also includes Pacific islands.
# Notes are at the end of this file
@@ -170,7 +170,12 @@ Zone Indian/Christmas 7:02:52 - LMT 1895 Feb
# no indigenous inhabitants; only meteorologists
# no information
#
-# Macquarie, Manihiki, Penrhyn, Rakehanga
+# Macquarie
+# permanent occupation (scientific station) since 1948;
+# sealing and penguin oil station operated 1888-1917
+# no information
+#
+# Manihiki, Penrhyn, Rakehanga
# no information
@@ -277,6 +282,9 @@ Zone Pacific/Nauru 11:07:40 - LMT 1921 Jan 15 # Uaobe
# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
Rule NC 1977 1978 - Dec Sun>=1 0:00 1:00 S
Rule NC 1978 1979 - Feb 27 0:00 0 -
+Rule NC 1996 only - Dec 1 2:00s 1:00 S
+Rule NC 1997 max - Mar Sun>=1 2:00s 0 -
+Rule NC 1997 max - Nov lastSun 2:00s 1:00 S
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
Zone Pacific/Noumea 11:05:48 - LMT 1912 Jan 13
11:00 NC NC%sT
@@ -315,8 +323,13 @@ Zone Pacific/Auckland 11:39:04 - LMT 1868
Zone Pacific/Chatham 12:45 Chatham CHA%sT
-# Antipodes Is, Kermadec Is
-# uninhabited except by research personnel; probably like Pacific/Auckland
+# Auckland Is
+# uninhabited
+
+# Campbell I
+# minor whaling stations operated 1909-14
+# scientific station operated 1941-1995
+# was probably like Pacific/Auckland
###############################################################################
diff --git a/time/europe b/time/europe
index 78ad05d7f5..23f45ada8d 100644
--- a/time/europe
+++ b/time/europe
@@ -1,4 +1,4 @@
-# @(#)europe 7.42
+# @(#)europe 7.43
# This data is by no means authoritative; if you think you know better,
# go ahead and edit the file (and please send any changes to
@@ -630,10 +630,18 @@
# came into force on 16 November. It restates the dates from the EC
# seventh Summer Time Directive....
#
-# From Peter Ilieve <peter@aldie.co.uk> (1996-04-20):
-# Proposals for the eighth directive were supposed to have been produced
-# by the Commission by 1 Jan 96. They have not yet appeared (I asked just
-# before Easter).
+# From Peter Ilieve <peter@aldie.co.uk> (1997-03-28):
+# The [European] Transport Council discussed the proposed Eighth Directive
+# on 11 March and agreed [to] it, so it moves forward to the next stage,
+# from a Commission proposal to a Common Position.... What this means is:
+#
+# - The eighth directive proposal rules have been accepted.
+# These are the same as the current rules (last Sunday in March and last
+# Sunday in October). The rules will run until 2001.
+#
+# - The French have had their request to abandon summer time turned down.
+# They have been promised some sort of review in 1999 which might change
+# the rules for 2000 and 2001.
# From Peter Ilieve <peter@memex.co.uk> (1994-03-28):
# The [GB-Eire] end date of 22 October [1995] conflicts with your current rule
diff --git a/time/northamerica b/time/northamerica
index 9bd959e45c..b70cb900c0 100644
--- a/time/northamerica
+++ b/time/northamerica
@@ -1,4 +1,4 @@
-# @(#)northamerica 7.30
+# @(#)northamerica 7.31
# also includes Central America and the Caribbean
# This data is by no means authoritative; if you think you know better,
@@ -1141,14 +1141,14 @@ Rule Cuba 1969 1971 - Oct lastSun 0:00 0 S
Rule Cuba 1972 1974 - Oct 8 0:00 0 S
Rule Cuba 1975 1977 - Oct lastSun 0:00 0 S
Rule Cuba 1978 only - May 7 0:00 1:00 D
-Rule Cuba 1978 1980 - Oct Sun>=8 0:00 0 S
+Rule Cuba 1978 1990 - Oct Sun>=8 0:00 0 S
Rule Cuba 1979 1980 - Mar Sun>=15 0:00 1:00 D
Rule Cuba 1981 1985 - May Sun>=5 0:00 1:00 D
-Rule Cuba 1981 1990 - Oct Sun>=8 0:00 0 S
Rule Cuba 1986 1989 - Mar Sun>=14 0:00 1:00 D
Rule Cuba 1990 max - Apr Sun>=1 0:00 1:00 D
Rule Cuba 1991 1995 - Oct Sun>=8 0:00s 0 S
-Rule Cuba 1996 max - Oct Sun>=1 0:00s 0 S
+Rule Cuba 1996 only - Oct Sun>=1 0:00s 0 S
+Rule Cuba 1997 max - Oct Sun>=8 0:00s 0 S
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
Zone America/Havana -5:29:28 - LMT 1890
diff --git a/time/private.h b/time/private.h
index 5502aa8c98..5a5b516d0f 100644
--- a/time/private.h
+++ b/time/private.h
@@ -176,13 +176,14 @@ extern int errno;
** Private function declarations.
*/
char * icalloc P((int nelem, int elsize));
-char * icatalloc P((char * old, const char * const new));
-char * icpyalloc P((const char * const string));
-char * imalloc P((const int n));
-void * irealloc P((void * const pointer, const int size));
-void icfree P((char * const pointer));
-void ifree P((char * const pointer));
-char * scheck P((const char * const string, const char * const format));
+char * icatalloc P((char * old, const char * new));
+char * icpyalloc P((const char * string));
+char * imalloc P((int n));
+void * irealloc P((void * pointer, int size));
+void icfree P((char * pointer));
+void ifree P((char * pointer));
+char * scheck P((const char *string, char *format));
+
/*
** Finally, some convenience items.
diff --git a/time/scheck.c b/time/scheck.c
index 52b4ff51fd..b51f58d042 100644
--- a/time/scheck.c
+++ b/time/scheck.c
@@ -11,7 +11,7 @@ static char elsieid[] = "@(#)scheck.c 8.14";
char *
scheck(string, format)
const char * const string;
-const char * const format;
+char * const format;
{
register char * fbuf;
register const char * fp;
diff --git a/time/southamerica b/time/southamerica
index b2b5138171..927f71638a 100644
--- a/time/southamerica
+++ b/time/southamerica
@@ -1,4 +1,4 @@
-# @(#)southamerica 7.16
+# @(#)southamerica 7.17
# This data is by no means authoritative; if you think you know better,
# go ahead and edit the file (and please send any changes to
@@ -267,10 +267,11 @@ Rule Brazil 1988 1989 - Oct Sun>=10 0:00 1:00 D
Rule Brazil 1990 1991 - Feb Sun>=11 0:00 0 S
Rule Brazil 1990 1992 - Oct Sun>=20 0:00 1:00 D
Rule Brazil 1992 only - Feb 9 0:00 0 S
-Rule Brazil 1993 max - Oct Sun>=11 0:00 1:00 D
+Rule Brazil 1993 1995 - Oct Sun>=11 0:00 1:00 D
Rule Brazil 1993 only - Jan 31 0:00 0 S
Rule Brazil 1994 1995 - Feb Sun>=15 0:00 0 S
Rule Brazil 1996 max - Feb Sun>=11 0:00 0 S
+Rule Brazil 1996 max - Oct Sun>=1 0:00 1:00 D
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
#
@@ -434,9 +435,11 @@ Rule Para 1991 only - Oct 6 0:00 1:00 S
Rule Para 1992 only - Mar 1 0:00 0 -
Rule Para 1992 only - Oct 5 0:00 1:00 S
Rule Para 1993 only - Mar 31 0:00 0 -
-Rule Para 1993 max - Oct 1 0:00 1:00 S
+Rule Para 1993 1995 - Oct 1 0:00 1:00 S
Rule Para 1994 1995 - Feb lastSun 0:00 0 -
Rule Para 1996 max - Mar 1 0:00 0 -
+Rule Para 1996 only - Oct 6 0:00 1:00 S
+Rule Para 1997 max - Oct 1 0:00 1:00 S
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
Zone America/Asuncion -3:50:40 - LMT 1890
-3:50:40 - AMT 1931 Oct 10 # Asuncion Mean Time