Index: src/include/port.h =================================================================== RCS file: /cvsroot/pgsql-server/src/include/port.h,v retrieving revision 1.58 diff -c -c -r1.58 port.h *** src/include/port.h 8 Sep 2004 19:43:07 -0000 1.58 --- src/include/port.h 9 Sep 2004 00:08:19 -0000 *************** *** 183,191 **** /* Global variable holding time zone information. */ #if !defined(__CYGWIN__) #define TIMEZONE_GLOBAL timezone #else #define TIMEZONE_GLOBAL _timezone ! #define tzname _tzname /* should be in time.h? */ #endif extern int copydir(char *fromdir, char *todir); --- 183,192 ---- /* Global variable holding time zone information. */ #if !defined(__CYGWIN__) #define TIMEZONE_GLOBAL timezone + #define TZNAME_GLOBAL tzname #else #define TIMEZONE_GLOBAL _timezone ! #define TZNAME_GLOBAL _tzname #endif extern int copydir(char *fromdir, char *todir); Index: src/interfaces/ecpg/pgtypeslib/dt_common.c =================================================================== RCS file: /cvsroot/pgsql-server/src/interfaces/ecpg/pgtypeslib/dt_common.c,v retrieving revision 1.18 diff -c -c -r1.18 dt_common.c *** src/interfaces/ecpg/pgtypeslib/dt_common.c 30 Aug 2004 02:54:41 -0000 1.18 --- src/interfaces/ecpg/pgtypeslib/dt_common.c 9 Sep 2004 00:08:25 -0000 *************** *** 1065,1072 **** * case it contains an error message, which doesn't fit in the * buffer */ ! StrNCpy(*tzn, tzname[tm->tm_isdst], MAXTZLEN + 1); ! if (strlen(tzname[tm->tm_isdst]) > MAXTZLEN) tm->tm_isdst = -1; } } --- 1065,1072 ---- * case it contains an error message, which doesn't fit in the * buffer */ ! StrNCpy(*tzn, TZNAME_GLOBAL[tm->tm_isdst], MAXTZLEN + 1); ! if (strlen(TZNAME_GLOBAL[tm->tm_isdst]) > MAXTZLEN) tm->tm_isdst = -1; } } Index: src/interfaces/ecpg/pgtypeslib/timestamp.c =================================================================== RCS file: /cvsroot/pgsql-server/src/interfaces/ecpg/pgtypeslib/timestamp.c,v retrieving revision 1.21 diff -c -c -r1.21 timestamp.c *** src/interfaces/ecpg/pgtypeslib/timestamp.c 30 Aug 2004 02:54:41 -0000 1.21 --- src/interfaces/ecpg/pgtypeslib/timestamp.c 9 Sep 2004 00:08:27 -0000 *************** *** 223,229 **** #elif defined(HAVE_INT_TIMEZONE) *tzp = ((tm->tm_isdst > 0) ? (TIMEZONE_GLOBAL - 3600) : TIMEZONE_GLOBAL); if (tzn != NULL) ! *tzn = tzname[(tm->tm_isdst > 0)]; #endif #else /* not (HAVE_TM_ZONE || HAVE_INT_TIMEZONE) */ --- 223,229 ---- #elif defined(HAVE_INT_TIMEZONE) *tzp = ((tm->tm_isdst > 0) ? (TIMEZONE_GLOBAL - 3600) : TIMEZONE_GLOBAL); if (tzn != NULL) ! *tzn = TZNAME_GLOBAL[(tm->tm_isdst > 0)]; #endif #else /* not (HAVE_TM_ZONE || HAVE_INT_TIMEZONE) */