Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit8d3d5d2

Browse files
committed
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 offixing the bug...
1 parenta246e87 commit8d3d5d2

File tree

2 files changed

+17
-2
lines changed

2 files changed

+17
-2
lines changed

‎src/backend/utils/adt/nabstime.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/utils/adt/nabstime.c,v 1.12 1997/01/10 20:19:33 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/utils/adt/nabstime.c,v 1.13 1997/01/27 01:51:21 scrappy Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -292,7 +292,7 @@ tryabsdate(char *fields[], int nf, struct tm *tm, int *tzp)
292292
(void)ftime(&now);
293293
*tzp=now.timezone;
294294
#else/* USE_POSIX_TIME */
295-
#ifdefHAVE_TZSET
295+
#if defined(HAVE_TZSET)&& defined(HAVE_INT_TIMEZONE)
296296
tzset();
297297
#ifndefwin32
298298
*tzp=timezone /60;/* this is an X/Open-ism */

‎src/include/config.h‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,8 @@
4545
# define DISABLE_XOPEN_NLS
4646
# defineNEED_UNION_SEMUN
4747
# define HAVE_TZSET
48+
# defineHAVE_INT_TIMEZONE
49+
# undef HAVE_CBRT
4850
# defineHAVE_ANSI_CPP
4951
# defineHAS_TEST_AND_SET
5052
typedefunsignedintslock_t;
@@ -101,6 +103,7 @@
101103
# defineJMP_BUF
102104
# defineUSE_POSIX_TIME
103105
# defineHAVE_TZSET
106+
# defineHAVE_INT_TIMEZONE
104107
# undef HAVE_CBRT
105108
# undef HAVE_RINT
106109
# defineNEED_UNION_SEMUN
@@ -116,6 +119,8 @@
116119
# undef HAVE_GETRUSAGE
117120
# defineNO_EMPTY_STMTS
118121
# defineHAVE_TZSET
122+
# defineHAVE_INT_TIMEZONE
123+
# undef HAVE_CBRT
119124
# defineNEED_UNION_SEMUN
120125
# define SYSV_DIRENT
121126
# defineHAS_TEST_AND_SET
@@ -129,6 +134,8 @@
129134
# defineNO_EMPTY_STMTS
130135
# defineNO_VFORK
131136
# defineHAVE_TZSET
137+
# defineHAVE_INT_TIMEZONE
138+
# undef HAVE_CBRT
132139
# defineSYSV_DIRENT
133140
# defineHAS_TEST_AND_SET
134141
# include<abi_mutex.h>
@@ -145,6 +152,8 @@
145152
# defineJMP_BUF
146153
# defineUSE_POSIX_TIME
147154
# defineHAVE_TZSET
155+
# defineHAVE_INT_TIMEZONE
156+
# undef HAVE_CBRT
148157
# undef HAVE_CBRT
149158
# defineNEED_I386_TAS_ASM
150159
# defineHAS_TEST_AND_SET
@@ -190,6 +199,8 @@
190199
# defineNO_EMPTY_STMTS
191200
# defineUSE_POSIX_TIME
192201
# defineHAVE_TZSET
202+
# defineHAVE_INT_TIMEZONE
203+
# undef HAVE_CBRT
193204
# defineNEED_UNION_SEMUN
194205
# define SYSV_DIRENT
195206
# defineHAS_TEST_AND_SET
@@ -208,6 +219,8 @@ typedef unsigned char slock_t;
208219
# undef HAVE_GETRUSAGE
209220
# defineNO_EMPTY_STMTS
210221
# defineHAVE_TZSET
222+
# defineHAVE_INT_TIMEZONE
223+
# undef HAVE_CBRT
211224
# defineNEED_UNION_SEMUN
212225
# define SYSV_DIRENT
213226
#endif
@@ -223,6 +236,8 @@ typedef unsigned char slock_t;
223236
# define NOFILE100
224237
# defineNEED_UNION_SEMUN
225238
# defineHAVE_TZSET
239+
# defineHAVE_INT_TIMEZONE
240+
# undef HAVE_CBRT
226241
# ifndefMAXPATHLEN
227242
# defineMAXPATHLEN 250
228243
# endif

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp