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

Fix from Yutaka Tanida <yutaka@marin.or.jp> for Cygwin32 support.

Browse Source
This commit is contained in:
Tatsuo Ishii 1999-04-26 04:42:49 +00:00
parent c84ea433d7
commit 89c7369d0e
3 changed files with 35 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/backend/utils/adt/datetime.c
View File

@ -7,7 +7,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/utils/adt/datetime.c,v 1.31 1999/04/15 02:22:37 thomas Exp $ * $Header: /cvsroot/pgsql/src/backend/utils/adt/datetime.c,v 1.32 1999/04/26 04:42:48 ishii Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -360,7 +360,11 @@ date2tm(DateADT dateVal, int *tzp, struct tm *tm, double *fsec, char **tzn)
if (tzn != NULL) if (tzn != NULL)
*tzn = (char *)tm->tm_zone; *tzn = (char *)tm->tm_zone;
#elif defined(HAVE_INT_TIMEZONE) #elif defined(HAVE_INT_TIMEZONE)
#ifdef __CYGWIN__
*tzp = (tm->tm_isdst ? (_timezone - 3600) : _timezone);
#else
*tzp = (tm->tm_isdst ? (timezone - 3600) : timezone); *tzp = (tm->tm_isdst ? (timezone - 3600) : timezone);
#endif
if (tzn != NULL) if (tzn != NULL)
*tzn = tzname[(tm->tm_isdst > 0)]; *tzn = tzname[(tm->tm_isdst > 0)];
#else #else

22
src/backend/utils/adt/dt.c
View File

@ -7,7 +7,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/dt.c,v 1.68 1999/04/15 02:22:39 thomas Exp $ * $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/dt.c,v 1.69 1999/04/26 04:42:48 ishii Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -1451,7 +1451,13 @@ datetime_trunc(text *units, DateTime *datetime)
#if defined(HAVE_TM_ZONE) #if defined(HAVE_TM_ZONE)
tz = -(tm->tm_gmtoff); /* tm_gmtoff is Sun/DEC-ism */ tz = -(tm->tm_gmtoff); /* tm_gmtoff is Sun/DEC-ism */
#elif defined(HAVE_INT_TIMEZONE) #elif defined(HAVE_INT_TIMEZONE)
tz = ((tm->tm_isdst > 0) ? (timezone - 3600) : timezone);
#ifdef __CYGWIN__
tz = (tm->tm_isdst ? (_timezone - 3600) : _timezone);
#else
tz = (tm->tm_isdst ? (timezone - 3600) : timezone);
#endif
#else #else
#error USE_POSIX_TIME is defined but neither HAVE_TM_ZONE or HAVE_INT_TIMEZONE are defined #error USE_POSIX_TIME is defined but neither HAVE_TM_ZONE or HAVE_INT_TIMEZONE are defined
#endif #endif
@ -2434,7 +2440,11 @@ datetime2tm(DateTime dt, int *tzp, struct tm * tm, double *fsec, char **tzn)
if (tzn != NULL) if (tzn != NULL)
*tzn = (char *)tm->tm_zone; *tzn = (char *)tm->tm_zone;
#elif defined(HAVE_INT_TIMEZONE) #elif defined(HAVE_INT_TIMEZONE)
#ifdef __CYGWIN__
*tzp = (tm->tm_isdst ? (_timezone - 3600) : _timezone);
#else
*tzp = (tm->tm_isdst ? (timezone - 3600) : timezone); *tzp = (tm->tm_isdst ? (timezone - 3600) : timezone);
#endif
if (tzn != NULL) if (tzn != NULL)
*tzn = tzname[(tm->tm_isdst > 0)]; *tzn = tzname[(tm->tm_isdst > 0)];
#else #else
@ -3058,7 +3068,13 @@ DecodeDateTime(char **field, int *ftype, int nf,
#if defined(HAVE_TM_ZONE) #if defined(HAVE_TM_ZONE)
*tzp = -(tm->tm_gmtoff); /* tm_gmtoff is Sun/DEC-ism */ *tzp = -(tm->tm_gmtoff); /* tm_gmtoff is Sun/DEC-ism */
#elif defined(HAVE_INT_TIMEZONE) #elif defined(HAVE_INT_TIMEZONE)
*tzp = ((tm->tm_isdst > 0) ? (timezone - 3600) : timezone); #ifdef __CYGWIN__
*tzp = ((tm->tm_isdst > 0) ? (_timezone - 3600) : _timez
one);
#else
*tzp = ((tm->tm_isdst > 0) ? (timezone - 3600) : timezon
e);
#endif
#else #else
#error USE_POSIX_TIME is defined but neither HAVE_TM_ZONE or HAVE_INT_TIMEZONE are defined #error USE_POSIX_TIME is defined but neither HAVE_TM_ZONE or HAVE_INT_TIMEZONE are defined
#endif #endif

13
src/backend/utils/adt/nabstime.c
View File

@ -4,7 +4,7 @@
* *
* Copyright (c) 1994, Regents of the University of California * Copyright (c) 1994, Regents of the University of California
* *
* $Id: nabstime.c,v 1.53 1999/02/21 03:49:32 scrappy Exp $ * $Id: nabstime.c,v 1.54 1999/04/26 04:42:49 ishii Exp $
* *
*/ */
#include <stdio.h> #include <stdio.h>
@ -77,7 +77,12 @@ GetCurrentAbsoluteTime(void)
tm = localtime(&now); tm = localtime(&now);
CDayLight = tm->tm_isdst; CDayLight = tm->tm_isdst;
CTimeZone = (tm->tm_isdst ? (timezone - 3600) : timezone); CTimeZone =
#ifdef __CYGWIN32__
(tm->tm_isdst ? (_timezone - 3600) : _timezone);
#else
(tm->tm_isdst ? (timezone - 3600) : timezone);
#endif
strcpy(CTZName, tzname[tm->tm_isdst]); strcpy(CTZName, tzname[tm->tm_isdst]);
#else #else
#error USE_POSIX_TIME defined but no time zone available #error USE_POSIX_TIME defined but no time zone available
@ -167,7 +172,11 @@ abstime2tm(AbsoluteTime time, int *tzp, struct tm * tm, char *tzn)
strcpy(tzn, tm->tm_zone); strcpy(tzn, tm->tm_zone);
#elif defined(HAVE_INT_TIMEZONE) #elif defined(HAVE_INT_TIMEZONE)
if (tzp != NULL) if (tzp != NULL)
#ifdef __CYGWIN__
*tzp = (tm->tm_isdst ? (_timezone - 3600) : _timezone);
#else
*tzp = (tm->tm_isdst ? (timezone - 3600) : timezone); *tzp = (tm->tm_isdst ? (timezone - 3600) : timezone);
#endif
if (tzn != NULL) if (tzn != NULL)
strcpy(tzn, tzname[tm->tm_isdst]); strcpy(tzn, tzname[tm->tm_isdst]);
#else #else