summary refs log tree commit diff
path: root/time/tzfile.c
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>1998-10-24 21:51:25 +0000
committerUlrich Drepper <drepper@redhat.com>1998-10-24 21:51:25 +0000
commit88455219c104124f82cc11d038b17cb249c4b6bd (patch)
tree3460b63b621e9f29123ac15ef2befad9fa2b1112 /time/tzfile.c
parentb0772d3be54b5bac2f1e45356eadd3c6a8277fd6 (diff)
downloadglibc-88455219c104124f82cc11d038b17cb249c4b6bd.tar.gz
glibc-88455219c104124f82cc11d038b17cb249c4b6bd.tar.xz
glibc-88455219c104124f82cc11d038b17cb249c4b6bd.zip
Update.
1998-10-24  H.J. Lu  <hjl@gnu.org>

	* time/tzfile.c (__tzfile_default): Set num_types to 2.

1998-10-23  Andreas Jaeger  <aj@arthur.rhein-neckar.de>

	* rt/aio.h: Move __aio_init to...
	* include/aio.h: ...here.

1998-10-24  Andreas Jaeger  <aj@arthur.rhein-neckar.de>

	* sysdeps/unix/sysv/linux/mips/bits/fcntl.h: Remove duplicate
	definition of O_LARGEFILE.

1998-10-24  Andreas Jaeger  <aj@arthur.rhein-neckar.de>

	* sysdeps/unix/sysv/linux/alpha/pathconf.c (__pathconf): Use path
	as first argument to statfs.

1998-10-24  Andreas Jaeger  <aj@arthur.rhein-neckar.de>

	* sysdeps/generic/setenv.c (setenv): Add braces around ambiguous else.

1998-10-24  Andreas Jaeger  <aj@arthur.rhein-neckar.de>

	* malloc/mtrace.c: Include <string.h> for strlen.
Diffstat (limited to 'time/tzfile.c')
-rw-r--r--time/tzfile.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/time/tzfile.c b/time/tzfile.c
index a7753d2f73..7c72aad103 100644
--- a/time/tzfile.c
+++ b/time/tzfile.c
@@ -343,6 +343,9 @@ __tzfile_default (const char *std, const char *dst,
     }
   __mempcpy (__mempcpy (zone_names, std, stdlen), dst, dstlen);
 
+  /* Now there are only two zones, regardless of what the file contained.  */
+  num_types = 2;
+
   /* Now correct the transition times for the user-specified standard and
      daylight offsets from GMT.  */
   isdst = 0;