summary refs log tree commit diff
path: root/timezone
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2007-10-14 09:15:45 +0000
committerUlrich Drepper <drepper@redhat.com>2007-10-14 09:15:45 +0000
commitfa76dde2cf59865481793b9f233df74aa5c7d4c1 (patch)
tree909e9a417ad03e800b5be3a11a2a59e571b5722d /timezone
parent89dc9d4c5b50c4e6397d0d74d0570e88f09fca99 (diff)
downloadglibc-fa76dde2cf59865481793b9f233df74aa5c7d4c1.tar.gz
glibc-fa76dde2cf59865481793b9f233df74aa5c7d4c1.tar.xz
glibc-fa76dde2cf59865481793b9f233df74aa5c7d4c1.zip
* include/time.h: Declare __tzset_parse_tz and __tzset_compute.
	* time/tzset.c (tzset_internal): Break TZ string parsing out into
	__tzset_parse_tz and updating of daylight, timezone, tzname into
	update_vars.
	(__tz_compute): Renamed from tz_compute.  Take additional parameters.
	(__tz_convert): Updating of tm_isdst, tm_zone, and tm_gmtoff now
	happens in __tz_compute.
	* time/tzfile.c (__tzfile_read): Also read TZ string.
	(find_transition): Fold into __tzfile_compute.
	(__tzfile_compute): For times beyond the last transition try to
	use the TZ string.
	* timezone/tst-timezone.c: Information in daylight and tzname does
	change for Asia/Tokyo timezone with more concrete information.
	Remove the test.

	* include/stdio.h: Add libc_hidden_proto for ftello.
	* libio/ftello.c: Add libc_hidden_def.
Diffstat (limited to 'timezone')
-rw-r--r--timezone/tst-timezone.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/timezone/tst-timezone.c b/timezone/tst-timezone.c
index 4c879163cf..00f899b851 100644
--- a/timezone/tst-timezone.c
+++ b/timezone/tst-timezone.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1998, 1999, 2000, 2005 Free Software Foundation, Inc.
+/* Copyright (C) 1998, 1999, 2000, 2005, 2007 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Andreas Jaeger <aj@suse.de>, 1998.
 
@@ -44,7 +44,6 @@ static const struct test_times tests[] =
   { "America/Chicago", 1, 21600, {"CST", "CDT" }},
   { "America/Indiana/Indianapolis", 1, 18000, {"EST", "EDT" }},
   { "America/Los_Angeles", 1, 28800, {"PST", "PDT" }},
-  { "Asia/Tokyo", 1, -32400, {"JST", "JDT" }},
   { "Pacific/Auckland", 1, -43200, { "NZST", "NZDT" }},
   { NULL, 0, 0 }
 };