Commit 8d3d5d2e authored by Marc G. Fournier's avatar Marc G. Fournier

Slight change to nabstime.c so that configure is able to handle a system

whereby timezone isn't an int, but tzset() exists...

This isn't a definitive fix, as there is probably an easier way of
fixing the bug...
parent a246e87d
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/utils/adt/nabstime.c,v 1.12 1997/01/10 20:19:33 momjian Exp $ * $Header: /cvsroot/pgsql/src/backend/utils/adt/nabstime.c,v 1.13 1997/01/27 01:51:21 scrappy Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
...@@ -292,7 +292,7 @@ tryabsdate(char *fields[], int nf, struct tm *tm, int *tzp) ...@@ -292,7 +292,7 @@ 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 */
#ifdef HAVE_TZSET #if defined(HAVE_TZSET) && defined(HAVE_INT_TIMEZONE)
tzset(); tzset();
#ifndef win32 #ifndef win32
*tzp = timezone / 60; /* this is an X/Open-ism */ *tzp = timezone / 60; /* this is an X/Open-ism */
......
...@@ -45,6 +45,8 @@ ...@@ -45,6 +45,8 @@
# define DISABLE_XOPEN_NLS # define DISABLE_XOPEN_NLS
# define NEED_UNION_SEMUN # define NEED_UNION_SEMUN
# define HAVE_TZSET # define HAVE_TZSET
# define HAVE_INT_TIMEZONE
# undef HAVE_CBRT
# define HAVE_ANSI_CPP # define HAVE_ANSI_CPP
# define HAS_TEST_AND_SET # define HAS_TEST_AND_SET
typedef unsigned int slock_t; typedef unsigned int slock_t;
...@@ -101,6 +103,7 @@ ...@@ -101,6 +103,7 @@
# define JMP_BUF # define JMP_BUF
# define USE_POSIX_TIME # define USE_POSIX_TIME
# define HAVE_TZSET # define HAVE_TZSET
# define HAVE_INT_TIMEZONE
# undef HAVE_CBRT # undef HAVE_CBRT
# undef HAVE_RINT # undef HAVE_RINT
# define NEED_UNION_SEMUN # define NEED_UNION_SEMUN
...@@ -116,6 +119,8 @@ ...@@ -116,6 +119,8 @@
# undef HAVE_GETRUSAGE # undef HAVE_GETRUSAGE
# define NO_EMPTY_STMTS # define NO_EMPTY_STMTS
# define HAVE_TZSET # define HAVE_TZSET
# define HAVE_INT_TIMEZONE
# undef HAVE_CBRT
# define NEED_UNION_SEMUN # define NEED_UNION_SEMUN
# define SYSV_DIRENT # define SYSV_DIRENT
# define HAS_TEST_AND_SET # define HAS_TEST_AND_SET
...@@ -129,6 +134,8 @@ ...@@ -129,6 +134,8 @@
# define NO_EMPTY_STMTS # define NO_EMPTY_STMTS
# define NO_VFORK # define NO_VFORK
# define HAVE_TZSET # define HAVE_TZSET
# define HAVE_INT_TIMEZONE
# undef HAVE_CBRT
# define SYSV_DIRENT # define SYSV_DIRENT
# define HAS_TEST_AND_SET # define HAS_TEST_AND_SET
# include <abi_mutex.h> # include <abi_mutex.h>
...@@ -145,6 +152,8 @@ ...@@ -145,6 +152,8 @@
# define JMP_BUF # define JMP_BUF
# define USE_POSIX_TIME # define USE_POSIX_TIME
# define HAVE_TZSET # define HAVE_TZSET
# define HAVE_INT_TIMEZONE
# undef HAVE_CBRT
# undef HAVE_CBRT # undef HAVE_CBRT
# define NEED_I386_TAS_ASM # define NEED_I386_TAS_ASM
# define HAS_TEST_AND_SET # define HAS_TEST_AND_SET
...@@ -190,6 +199,8 @@ ...@@ -190,6 +199,8 @@
# define NO_EMPTY_STMTS # define NO_EMPTY_STMTS
# define USE_POSIX_TIME # define USE_POSIX_TIME
# define HAVE_TZSET # define HAVE_TZSET
# define HAVE_INT_TIMEZONE
# undef HAVE_CBRT
# define NEED_UNION_SEMUN # define NEED_UNION_SEMUN
# define SYSV_DIRENT # define SYSV_DIRENT
# define HAS_TEST_AND_SET # define HAS_TEST_AND_SET
...@@ -208,6 +219,8 @@ typedef unsigned char slock_t; ...@@ -208,6 +219,8 @@ typedef unsigned char slock_t;
# undef HAVE_GETRUSAGE # undef HAVE_GETRUSAGE
# define NO_EMPTY_STMTS # define NO_EMPTY_STMTS
# define HAVE_TZSET # define HAVE_TZSET
# define HAVE_INT_TIMEZONE
# undef HAVE_CBRT
# define NEED_UNION_SEMUN # define NEED_UNION_SEMUN
# define SYSV_DIRENT # define SYSV_DIRENT
#endif #endif
...@@ -223,6 +236,8 @@ typedef unsigned char slock_t; ...@@ -223,6 +236,8 @@ typedef unsigned char slock_t;
# define NOFILE 100 # define NOFILE 100
# define NEED_UNION_SEMUN # define NEED_UNION_SEMUN
# define HAVE_TZSET # define HAVE_TZSET
# define HAVE_INT_TIMEZONE
# undef HAVE_CBRT
# ifndef MAXPATHLEN # ifndef MAXPATHLEN
# define MAXPATHLEN 250 # define MAXPATHLEN 250
# endif # endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment