diff options
Diffstat (limited to 'src/timezone/pgtz.c')
| -rw-r--r-- | src/timezone/pgtz.c | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/src/timezone/pgtz.c b/src/timezone/pgtz.c index ad599c70936..7370a9306d5 100644 --- a/src/timezone/pgtz.c +++ b/src/timezone/pgtz.c @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group * * IDENTIFICATION - * $PostgreSQL: pgsql/src/timezone/pgtz.c,v 1.53 2007/08/04 19:29:25 tgl Exp $ + * $PostgreSQL: pgsql/src/timezone/pgtz.c,v 1.54 2007/08/25 20:29:25 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -38,9 +38,6 @@ pg_tz *gmt_timezone = NULL; static pg_tz gmt_timezone_data; -static char tzdir[MAXPGPATH]; -static bool done_tzdir = false; - static bool scan_directory_ci(const char *dirname, const char *fname, int fnamelen, char *canonname, int canonnamelen); @@ -52,9 +49,14 @@ static pg_tz *select_default_timezone(void); /* * Return full pathname of timezone data directory */ -static char * +static const char * pg_TZDIR(void) { +#ifndef SYSTEMTZDIR + /* normal case: timezone stuff is under our share dir */ + static bool done_tzdir = false; + static char tzdir[MAXPGPATH]; + if (done_tzdir) return tzdir; @@ -63,6 +65,10 @@ pg_TZDIR(void) done_tzdir = true; return tzdir; +#else + /* we're configured to use system's timezone database */ + return SYSTEMTZDIR; +#endif } |