mirror of
https://git.postgresql.org/git/postgresql.git
synced 2024-12-21 08:29:39 +08:00
Move "port specific" #ifdefs out of here and into config.h
- created a HAVE_TZSET define for this purpose
This commit is contained in:
parent
c39857925b
commit
a839456c41
@ -7,7 +7,7 @@
|
|||||||
*
|
*
|
||||||
*
|
*
|
||||||
* IDENTIFICATION
|
* 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);
|
(void) ftime(&now);
|
||||||
*tzp = now.timezone;
|
*tzp = now.timezone;
|
||||||
#else /* USE_POSIX_TIME */
|
#else /* USE_POSIX_TIME */
|
||||||
#if defined(PORTNAME_aix) || \
|
#ifdef HAVE_TZSET
|
||||||
defined(PORTNAME_hpux) || \
|
|
||||||
defined(PORTNAME_i386_solaris) || \
|
|
||||||
defined(PORTNAME_irix5) || \
|
|
||||||
defined(PORTNAME_sparc_solaris) || \
|
|
||||||
defined(PORTNAME_svr4) || \
|
|
||||||
defined(WIN32)
|
|
||||||
tzset();
|
tzset();
|
||||||
#ifndef WIN32
|
#ifndef win32
|
||||||
*tzp = timezone / 60; /* this is an X/Open-ism */
|
*tzp = timezone / 60; /* this is an X/Open-ism */
|
||||||
#else
|
#else
|
||||||
*tzp = _timezone / 60; /* this is an X/Open-ism */
|
*tzp = _timezone / 60; /* this is an X/Open-ism */
|
||||||
#endif /* WIN32 */
|
#endif /* win32 */
|
||||||
#else /* PORTNAME_aix || PORTNAME_hpux || ... */
|
#else /* !HAVE_TZSET */
|
||||||
time_t now = time((time_t *) NULL);
|
time_t now = time((time_t *) NULL);
|
||||||
struct tm *tmnow = localtime(&now);
|
struct tm *tmnow = localtime(&now);
|
||||||
|
|
||||||
*tzp = - tmnow->tm_gmtoff / 60; /* tm_gmtoff is Sun/DEC-ism */
|
*tzp = - tmnow->tm_gmtoff / 60; /* tm_gmtoff is Sun/DEC-ism */
|
||||||
#endif /* PORTNAME_aix || PORTNAME_hpux || ... */
|
#endif
|
||||||
#endif /* USE_POSIX_TIME */
|
#endif
|
||||||
|
|
||||||
tm->tm_mday = tm->tm_mon = tm->tm_year = -1; /* mandatory */
|
tm->tm_mday = tm->tm_mon = tm->tm_year = -1; /* mandatory */
|
||||||
tm->tm_hour = tm->tm_min = tm->tm_sec = 0;
|
tm->tm_hour = tm->tm_min = tm->tm_sec = 0;
|
||||||
|
Loading…
Reference in New Issue
Block a user