mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make TZNAME_GLOBAL for reference to tzname global variable.

Browse Source
This commit is contained in:
Bruce Momjian 2004-09-09 00:24:12 +00:00
parent f62901ca81
commit b70999d0fd
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/include/port.h
View File

@ -6,7 +6,7 @@
* Portions Copyright (c) 1996-2004, PostgreSQL Global Development Group * Portions Copyright (c) 1996-2004, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California * Portions Copyright (c) 1994, Regents of the University of California
* *
* $PostgreSQL: pgsql/src/include/port.h,v 1.58 2004/09/08 19:43:07 momjian Exp $ * $PostgreSQL: pgsql/src/include/port.h,v 1.59 2004/09/09 00:24:10 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -183,9 +183,10 @@ extern int win32_open(const char *, int,...);
/* Global variable holding time zone information. */ /* Global variable holding time zone information. */
#if !defined(__CYGWIN__) #if !defined(__CYGWIN__)
#define TIMEZONE_GLOBAL timezone #define TIMEZONE_GLOBAL timezone
#define TZNAME_GLOBAL tzname
#else #else
#define TIMEZONE_GLOBAL _timezone #define TIMEZONE_GLOBAL _timezone
#define tzname _tzname /* should be in time.h? */ #define TZNAME_GLOBAL _tzname
#endif #endif
extern int copydir(char *fromdir, char *todir); extern int copydir(char *fromdir, char *todir);

4
src/interfaces/ecpg/pgtypeslib/dt_common.c
View File

@ -1065,8 +1065,8 @@ abstime2tm(AbsoluteTime _time, int *tzp, struct tm * tm, char **tzn)
* case it contains an error message, which doesn't fit in the * case it contains an error message, which doesn't fit in the
* buffer * buffer
*/ */
StrNCpy(*tzn, tzname[tm->tm_isdst], MAXTZLEN + 1); StrNCpy(*tzn, TZNAME_GLOBAL[tm->tm_isdst], MAXTZLEN + 1);
if (strlen(tzname[tm->tm_isdst]) > MAXTZLEN) if (strlen(TZNAME_GLOBAL[tm->tm_isdst]) > MAXTZLEN)
tm->tm_isdst = -1; tm->tm_isdst = -1;
} }
} }

2
src/interfaces/ecpg/pgtypeslib/timestamp.c
View File

@ -223,7 +223,7 @@ timestamp2tm(timestamp dt, int *tzp, struct tm * tm, fsec_t *fsec, char **tzn)
#elif defined(HAVE_INT_TIMEZONE) #elif defined(HAVE_INT_TIMEZONE)
*tzp = ((tm->tm_isdst > 0) ? (TIMEZONE_GLOBAL - 3600) : TIMEZONE_GLOBAL); *tzp = ((tm->tm_isdst > 0) ? (TIMEZONE_GLOBAL - 3600) : TIMEZONE_GLOBAL);
if (tzn != NULL) if (tzn != NULL)
*tzn = tzname[(tm->tm_isdst > 0)]; *tzn = TZNAME_GLOBAL[(tm->tm_isdst > 0)];
#endif #endif
#else /* not (HAVE_TM_ZONE || HAVE_INT_TIMEZONE) */ #else /* not (HAVE_TM_ZONE || HAVE_INT_TIMEZONE) */