aboutsummaryrefslogtreecommitdiff
path: root/src/backend/utils/adt/date.c
diff options
context:
space:
mode:
authorPeter Eisentraut <peter_e@gmx.net>2000-10-29 13:17:34 +0000
committerPeter Eisentraut <peter_e@gmx.net>2000-10-29 13:17:34 +0000
commit525e1c4436651c39f713416348bd35e3176b7797 (patch)
tree6f1f991d40bc259990be5f581f791882c4aae6af /src/backend/utils/adt/date.c
parent8b0431129309e4a4ddbc91f5a3e58631a07ac13c (diff)
downloadpostgresql-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/date.c')
-rw-r--r--src/backend/utils/adt/date.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/backend/utils/adt/date.c b/src/backend/utils/adt/date.c
index ba1b7f6a4d2..a19ae9e48af 100644
--- a/src/backend/utils/adt/date.c
+++ b/src/backend/utils/adt/date.c
@@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/adt/date.c,v 1.50 2000/09/12 05:41:37 thomas Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/adt/date.c,v 1.51 2000/10/29 13:17:33 petere Exp $
*
*-------------------------------------------------------------------------
*/
@@ -232,7 +232,7 @@ date_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_hour = 0;
tm->tm_min = 0;
tm->tm_sec = 0;
@@ -245,7 +245,7 @@ date_timestamp(PG_FUNCTION_ARGS)
elog(ERROR, "Unable to convert date to tm");
result = utime + ((date2j(1970,1,1)-date2j(2000,1,1))*86400.0);
-#else /* !USE_POSIX_TIME */
+#else
result = dateVal*86400.0+CTimeZone;
#endif
}