diff options
| author | Marc G. Fournier | 1997-01-27 01:51:26 +0000 |
|---|---|---|
| committer | Marc G. Fournier | 1997-01-27 01:51:26 +0000 |
| commit | 8d3d5d2e2f8739aa74a3e1293a324036f1852dfe (patch) | |
| tree | f064298c651f1c8ea7ee7a11644c6a6d2fe1dd8e | |
| parent | a246e87d12601ab76e8f7f7993b5f3ffb2635091 (diff) | |
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...
| -rw-r--r-- | src/backend/utils/adt/nabstime.c | 4 | ||||
| -rw-r--r-- | src/include/config.h | 15 |
2 files changed, 17 insertions, 2 deletions
diff --git a/src/backend/utils/adt/nabstime.c b/src/backend/utils/adt/nabstime.c index 438b35df375..83858920780 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.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) (void) ftime(&now); *tzp = now.timezone; #else /* USE_POSIX_TIME */ -#ifdef HAVE_TZSET +#if defined(HAVE_TZSET) && defined(HAVE_INT_TIMEZONE) tzset(); #ifndef win32 *tzp = timezone / 60; /* this is an X/Open-ism */ diff --git a/src/include/config.h b/src/include/config.h index 605fb434ef1..04fd932d616 100644 --- a/src/include/config.h +++ b/src/include/config.h @@ -45,6 +45,8 @@ # define DISABLE_XOPEN_NLS # define NEED_UNION_SEMUN # define HAVE_TZSET +# define HAVE_INT_TIMEZONE +# undef HAVE_CBRT # define HAVE_ANSI_CPP # define HAS_TEST_AND_SET typedef unsigned int slock_t; @@ -101,6 +103,7 @@ # define JMP_BUF # define USE_POSIX_TIME # define HAVE_TZSET +# define HAVE_INT_TIMEZONE # undef HAVE_CBRT # undef HAVE_RINT # define NEED_UNION_SEMUN @@ -116,6 +119,8 @@ # undef HAVE_GETRUSAGE # define NO_EMPTY_STMTS # define HAVE_TZSET +# define HAVE_INT_TIMEZONE +# undef HAVE_CBRT # define NEED_UNION_SEMUN # define SYSV_DIRENT # define HAS_TEST_AND_SET @@ -129,6 +134,8 @@ # define NO_EMPTY_STMTS # define NO_VFORK # define HAVE_TZSET +# define HAVE_INT_TIMEZONE +# undef HAVE_CBRT # define SYSV_DIRENT # define HAS_TEST_AND_SET # include <abi_mutex.h> @@ -145,6 +152,8 @@ # define JMP_BUF # define USE_POSIX_TIME # define HAVE_TZSET +# define HAVE_INT_TIMEZONE +# undef HAVE_CBRT # undef HAVE_CBRT # define NEED_I386_TAS_ASM # define HAS_TEST_AND_SET @@ -190,6 +199,8 @@ # define NO_EMPTY_STMTS # define USE_POSIX_TIME # define HAVE_TZSET +# define HAVE_INT_TIMEZONE +# undef HAVE_CBRT # define NEED_UNION_SEMUN # define SYSV_DIRENT # define HAS_TEST_AND_SET @@ -208,6 +219,8 @@ typedef unsigned char slock_t; # undef HAVE_GETRUSAGE # define NO_EMPTY_STMTS # define HAVE_TZSET +# define HAVE_INT_TIMEZONE +# undef HAVE_CBRT # define NEED_UNION_SEMUN # define SYSV_DIRENT #endif @@ -223,6 +236,8 @@ typedef unsigned char slock_t; # define NOFILE 100 # define NEED_UNION_SEMUN # define HAVE_TZSET +# define HAVE_INT_TIMEZONE +# undef HAVE_CBRT # ifndef MAXPATHLEN # define MAXPATHLEN 250 # endif |