diff options
| author | Peter Eisentraut <peter_e@gmx.net> | 2000-10-29 13:17:34 +0000 |
|---|---|---|
| committer | Peter Eisentraut <peter_e@gmx.net> | 2000-10-29 13:17:34 +0000 |
| commit | 525e1c4436651c39f713416348bd35e3176b7797 (patch) | |
| tree | 6f1f991d40bc259990be5f581f791882c4aae6af /src/backend/utils/adt/formatting.c | |
| parent | 8b0431129309e4a4ddbc91f5a3e58631a07ac13c (diff) | |
| download | postgresql-525e1c4436651c39f713416348bd35e3176b7797.tar.gz postgresql-525e1c4436651c39f713416348bd35e3176b7797.zip | |
USE_POSIX_TIME replaced by HAVE_TM_ZONE || HAVE_INT_TIMEZONE, which are
equivalent.
In linux.h there were some #undef HAVE_INT_TIMEZONE, which are useless
because HAVE_TM_ZONE overrides it anyway, and messing with configure
results isn't cool.
Diffstat (limited to 'src/backend/utils/adt/formatting.c')
| -rw-r--r-- | src/backend/utils/adt/formatting.c | 24 |
1 files changed, 11 insertions, 13 deletions
diff --git a/src/backend/utils/adt/formatting.c b/src/backend/utils/adt/formatting.c index 748bb694d79..b1e412907d1 100644 --- a/src/backend/utils/adt/formatting.c +++ b/src/backend/utils/adt/formatting.c @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- * formatting.c * - * $Header: /cvsroot/pgsql/src/backend/utils/adt/formatting.c,v 1.22 2000/09/25 12:58:47 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/formatting.c,v 1.23 2000/10/29 13:17:34 petere Exp $ * * * Portions Copyright (c) 1999-2000, PostgreSQL, Inc @@ -2781,34 +2781,32 @@ to_timestamp(PG_FUNCTION_ARGS) if (IS_VALID_UTIME(tm->tm_year, tm->tm_mon, tm->tm_mday)) { -#ifdef USE_POSIX_TIME +#if defined(HAVE_TM_ZONE) || defined(HAVE_INT_TIMEZONE) tm->tm_isdst = -1; tm->tm_year -= 1900; tm->tm_mon -= 1; -#ifdef DEBUG_TO_FROM_CHAR +# ifdef DEBUG_TO_FROM_CHAR elog(DEBUG_elog_output, "TO-FROM_CHAR: Call mktime()"); NOTICE_TM; -#endif +# endif mktime(tm); tm->tm_year += 1900; tm->tm_mon += 1; -#if defined(HAVE_TM_ZONE) +# if defined(HAVE_TM_ZONE) tz = -(tm->tm_gmtoff); /* tm_gmtoff is Sun/DEC-ism */ -#elif defined(HAVE_INT_TIMEZONE) +# elif defined(HAVE_INT_TIMEZONE) -#ifdef __CYGWIN__ +# ifdef __CYGWIN__ tz = (tm->tm_isdst ? (_timezone - 3600) : _timezone); -#else +# else tz = (tm->tm_isdst ? (timezone - 3600) : timezone); -#endif +# endif -#else -#error USE_POSIX_TIME is defined but neither HAVE_TM_ZONE or HAVE_INT_TIMEZONE are defined -#endif +# endif -#else /* !USE_POSIX_TIME */ +#else /* not (HAVE_TM_ZONE || HAVE_INT_TIMEZONE) */ tz = CTimeZone; #endif } |