From a839456c417fbd87420726ff68048178038bb3ca Mon Sep 17 00:00:00 2001 From: "Marc G. Fournier" Date: Thu, 17 Oct 1996 23:59:45 +0000 Subject: [PATCH] Move "port specific" #ifdefs out of here and into config.h - created a HAVE_TZSET define for this purpose --- src/backend/utils/adt/nabstime.c | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/src/backend/utils/adt/nabstime.c b/src/backend/utils/adt/nabstime.c index 875aa1d82e..ea59ee2e7b 100644 --- a/src/backend/utils/adt/nabstime.c +++ b/src/backend/utils/adt/nabstime.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/nabstime.c,v 1.4 1996/08/19 13:52:40 scrappy Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/nabstime.c,v 1.5 1996/10/17 23:59:45 scrappy Exp $ * *------------------------------------------------------------------------- */ @@ -291,26 +291,20 @@ tryabsdate(char *fields[], int nf, struct tm *tm, int *tzp) (void) ftime(&now); *tzp = now.timezone; #else /* USE_POSIX_TIME */ -#if defined(PORTNAME_aix) || \ - defined(PORTNAME_hpux) || \ - defined(PORTNAME_i386_solaris) || \ - defined(PORTNAME_irix5) || \ - defined(PORTNAME_sparc_solaris) || \ - defined(PORTNAME_svr4) || \ - defined(WIN32) +#ifdef HAVE_TZSET tzset(); -#ifndef WIN32 +#ifndef win32 *tzp = timezone / 60; /* this is an X/Open-ism */ #else *tzp = _timezone / 60; /* this is an X/Open-ism */ -#endif /* WIN32 */ -#else /* PORTNAME_aix || PORTNAME_hpux || ... */ +#endif /* win32 */ +#else /* !HAVE_TZSET */ time_t now = time((time_t *) NULL); struct tm *tmnow = localtime(&now); *tzp = - tmnow->tm_gmtoff / 60; /* tm_gmtoff is Sun/DEC-ism */ -#endif /* PORTNAME_aix || PORTNAME_hpux || ... */ -#endif /* USE_POSIX_TIME */ +#endif +#endif tm->tm_mday = tm->tm_mon = tm->tm_year = -1; /* mandatory */ tm->tm_hour = tm->tm_min = tm->tm_sec = 0;