summaryrefslogtreecommitdiff
path: root/time/asia
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>1997-07-19 21:18:32 +0000
committerUlrich Drepper <drepper@redhat.com>1997-07-19 21:18:32 +0000
commit907a1bacf996264c3197342cfc565b1d4f840bfb (patch)
treeec78ea7cfaf5e43e4f9a8b54198e8aa65f32d2f4 /time/asia
parentcd6ede759fadcf8cd1f8c069928611d18cef5c1a (diff)
1997-07-19 22:53 Ulrich Drepper <drepper@cygnus.com> * time/africa: Update from tzdata1997g. * time/asia: Likewise. * time/australia: Likewise. * time/europe: Likewise. * time/iso3166.tab: Likewise. * time/zone.tab: Likewise. * time/private.h: Update from tzcode1997f. * time/scheck.c: Likewise. * libio/stdio.h: Declare snprint and vsnprintf for __USE_ISOC9X. * math/math.h: Correct comments. Include <bits/mathinline.h> always when optimizing. 1997-07-19 10:23 Mark Kettenis <kettenis@phys.uva.nl> * time/getdate.c (__getdate_r): Report failure if string was not completely parsed. (getdate): Set getdate_err on failure. 1997-07-17 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * include/gnu-versions.h (_GNU_OBSTACK_INTERFACE_VERSION): Synchronize with malloc/obstack.c. 1997-07-16 Miles Bader <miles@gnu.ai.mit.edu> * sysdeps/mach/hurd/mmap.c (__mmap): Check for !MAP_SHARED rather than MAP_COPY|MAP_PRIVATE, since those values are defined wierdly. Return EACCES rather than EGRATUITOUS if a R/W request isn't writable. 1997-07-15 Marcus G. Daniels <marcus@cathcart.sysc.pdx.edu> * manual/Makefile (INSTALL_INFO): Introduce variable to override path to install-info for systems like Debian that have an install-info with a different command line interface from the canonical GNU texinfo version. 1997-07-15 Andreas Jaeger <aj@arthur.rhein-neckar.de> * sysdeps/posix/ttyname_r.c (__ttyname_r): Correct comment. * posix/unistd.h: Likewise. * sysdeps/stub/ttyname_r.c: Likewise. * sysdeps/unix/sysv/linux/sys/syscall.h: Pretty print.
Diffstat (limited to 'time/asia')
-rw-r--r--time/asia45
1 files changed, 22 insertions, 23 deletions
diff --git a/time/asia b/time/asia
index 829d40b9a8..6734749179 100644
--- a/time/asia
+++ b/time/asia
@@ -1,4 +1,4 @@
-# @(#)asia 7.29
+# @(#)asia 7.30
# 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
@@ -214,28 +214,6 @@ Zone Asia/Kashgar 5:03:56 - LMT 1928
5:30 - KAST 1940 # Kashgar Time
5:00 - KAST 1980 May
8:00 PRC C%sT
-
-###############################################################################
-
-# Republic of China
-
-# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-Rule Taiwan 1945 1951 - May 1 0:00 1:00 D
-Rule Taiwan 1945 1951 - Oct 1 0:00 0 S
-Rule Taiwan 1952 only - Mar 1 0:00 1:00 D
-Rule Taiwan 1952 1954 - Nov 1 0:00 0 S
-Rule Taiwan 1953 1959 - Apr 1 0:00 1:00 D
-Rule Taiwan 1955 1961 - Oct 1 0:00 0 S
-Rule Taiwan 1960 1961 - Jun 1 0:00 1:00 D
-Rule Taiwan 1974 1975 - Apr 1 0:00 1:00 D
-Rule Taiwan 1974 1975 - Oct 1 0:00 0 S
-Rule Taiwan 1980 only - Jun 30 0:00 1:00 D
-Rule Taiwan 1980 only - Sep 30 0:00 0 S
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
-Zone Asia/Taipei 8:06:00 - LMT 1896
- 8:00 Taiwan C%sT
-
-###############################################################################
# Hong Kong
# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
Rule HK 1946 only - Apr 20 3:30 1:00 S
@@ -258,6 +236,27 @@ Zone Asia/Hong_Kong 7:36:36 - LMT 1904 Oct 30
8:00 HK HK%sT 1997 Jul 1 # return to China
8:00 PRC C%sT
+
+###############################################################################
+
+# Republic of China
+
+# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
+Rule Taiwan 1945 1951 - May 1 0:00 1:00 D
+Rule Taiwan 1945 1951 - Oct 1 0:00 0 S
+Rule Taiwan 1952 only - Mar 1 0:00 1:00 D
+Rule Taiwan 1952 1954 - Nov 1 0:00 0 S
+Rule Taiwan 1953 1959 - Apr 1 0:00 1:00 D
+Rule Taiwan 1955 1961 - Oct 1 0:00 0 S
+Rule Taiwan 1960 1961 - Jun 1 0:00 1:00 D
+Rule Taiwan 1974 1975 - Apr 1 0:00 1:00 D
+Rule Taiwan 1974 1975 - Oct 1 0:00 0 S
+Rule Taiwan 1980 only - Jun 30 0:00 1:00 D
+Rule Taiwan 1980 only - Sep 30 0:00 0 S
+# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+Zone Asia/Taipei 8:06:00 - LMT 1896
+ 8:00 Taiwan C%sT
+
# Macao
# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
Rule Macao 1961 1962 - Mar Sun>=16 3:30 1:00 S