diff options
| author | Thomas G. Lockhart <lockhart@fourpalms.org> | 2001-01-18 07:22:43 +0000 |
|---|---|---|
| committer | Thomas G. Lockhart <lockhart@fourpalms.org> | 2001-01-18 07:22:43 +0000 |
| commit | 6acdebbd3a6e516e26b9d5ff7c51e51802e7345b (patch) | |
| tree | fb6f50e911633a34618a8fdcd5c758ae93046f53 /src/backend/utils/adt/nabstime.c | |
| parent | 6439de1752db399c862f9f440e5ec15ef5243592 (diff) | |
Fix up "Postgres-style" time interval representation when fields have
mixed-signs. Previous effort left way too many minus signs, and was at
least as broken as the one before that :(
Clean up "ISO-style" time interval representation to omit zero fields if
there is at least one non-zero field. Supress some leading plus signs
when not necessary for clarity.
Replace every #ifdef __CYGWIN__ block with a cleaner TIMEZONE_GLOBAL macro
defined in datetime.h.
Diffstat (limited to 'src/backend/utils/adt/nabstime.c')
| -rw-r--r-- | src/backend/utils/adt/nabstime.c | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/src/backend/utils/adt/nabstime.c b/src/backend/utils/adt/nabstime.c index 19c2068fe94..972f5e98a6b 100644 --- a/src/backend/utils/adt/nabstime.c +++ b/src/backend/utils/adt/nabstime.c @@ -9,7 +9,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/nabstime.c,v 1.78 2001/01/17 16:46:56 thomas Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/nabstime.c,v 1.79 2001/01/18 07:22:36 thomas Exp $ * * NOTES * @@ -160,12 +160,7 @@ GetCurrentAbsoluteTime(void) tm = localtime(&now); CDayLight = tm->tm_isdst; - CTimeZone = -# ifdef __CYGWIN__ - ((tm->tm_isdst > 0) ? (_timezone - 3600) : _timezone); -# else - ((tm->tm_isdst > 0) ? (timezone - 3600) : timezone); -# endif + CTimeZone = ((tm->tm_isdst > 0) ? (TIMEZONE_GLOBAL - 3600) : TIMEZONE_GLOBAL); strcpy(CTZName, tzname[tm->tm_isdst]); #else /* neither HAVE_TM_ZONE nor HAVE_INT_TIMEZONE */ CTimeZone = tb.timezone * 60; @@ -244,11 +239,8 @@ abstime2tm(AbsoluteTime _time, int *tzp, struct tm * tm, char *tzn) } # elif defined(HAVE_INT_TIMEZONE) if (tzp != NULL) -# ifdef __CYGWIN__ - *tzp = ((tm->tm_isdst > 0) ? (_timezone - 3600) : _timezone); -# else - *tzp = ((tm->tm_isdst > 0) ? (timezone - 3600) : timezone); -# endif + *tzp = ((tm->tm_isdst > 0) ? (TIMEZONE_GLOBAL - 3600) : TIMEZONE_GLOBAL); + if (tzn != NULL) { |