about summary refs log tree commit diff
path: root/timezone/tzfile.h
diff options
context:
space:
mode:
authorJoseph Myers <joseph@codesourcery.com>2018-12-10 13:11:58 +0000
committerJoseph Myers <joseph@codesourcery.com>2018-12-10 13:11:58 +0000
commit0afcb29d50312409f0b698001d1ee2b535d06a3c (patch)
tree810bf1bbcabd4ad6cc535fb15de39c22b7aeac2e /timezone/tzfile.h
parentb93f4052fc171f456c8f594d4ae4aeb02ec5b3b6 (diff)
downloadglibc-0afcb29d50312409f0b698001d1ee2b535d06a3c.tar.gz
glibc-0afcb29d50312409f0b698001d1ee2b535d06a3c.tar.xz
glibc-0afcb29d50312409f0b698001d1ee2b535d06a3c.zip
Update timezone code from tzcode 2018g.
This patch updates files coming from tzcode to the versions in tzcode
2018g.  No changes elsewhere in glibc were needed.

Tested for x86_64.

	* timezone/private.h: Update from tzcode 2018g.
	* timezone/tzfile.h: Likewise.
	* timezone/tzselect.ksh: Likewise.
	* timezone/zdump.c: Likewise.
	* timezone/zic.c: Likewise.
Diffstat (limited to 'timezone/tzfile.h')
-rw-r--r--timezone/tzfile.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/timezone/tzfile.h b/timezone/tzfile.h
index 0e51dce1d7..27a38cc74d 100644
--- a/timezone/tzfile.h
+++ b/timezone/tzfile.h
@@ -1,3 +1,5 @@
+/* Layout and location of TZif files.  */
+
 #ifndef TZFILE_H
 
 #define TZFILE_H
@@ -20,11 +22,11 @@
 */
 
 #ifndef TZDIR
-#define TZDIR	"/usr/local/etc/zoneinfo" /* Time zone object file directory */
+#define TZDIR	"/usr/share/zoneinfo" /* Time zone object file directory */
 #endif /* !defined TZDIR */
 
 #ifndef TZDEFAULT
-#define TZDEFAULT	"localtime"
+#define TZDEFAULT	"/etc/localtime"
 #endif /* !defined TZDEFAULT */
 
 #ifndef TZDEFRULES