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

Commit5eb6de5

Browse files
committed
Remove NO_MKTIME_BEFORE_1970. I had speculated that it was not needed
anymore given the mktime() workaround now done in DetermineLocalTimeZone.This has now been confirmed by Robert Bruccoleri for Irix, and I'm goingto extrapolate to AIX as well.
1 parentf9b5b41 commit5eb6de5

File tree

5 files changed

+7
-25
lines changed

5 files changed

+7
-25
lines changed

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

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
*
1010
*
1111
* IDENTIFICATION
12-
* $Header: /cvsroot/pgsql/src/backend/utils/adt/nabstime.c,v 1.100 2002/10/04 17:34:01 tgl Exp $
12+
* $Header: /cvsroot/pgsql/src/backend/utils/adt/nabstime.c,v 1.101 2002/11/12 00:39:08 tgl Exp $
1313
*
1414
* NOTES
1515
*
@@ -289,21 +289,9 @@ abstime2tm(AbsoluteTime _time, int *tzp, struct tm * tm, char **tzn)
289289

290290
#if defined(HAVE_TM_ZONE)|| defined(HAVE_INT_TIMEZONE)
291291
if ((!HasCTZSet)&& (tzp!=NULL))
292-
{
293292
tx=localtime((time_t*)&time);
294-
#ifdefNO_MKTIME_BEFORE_1970
295-
if (tx->tm_year<70&&tx->tm_isdst==1)
296-
{
297-
time-=3600;
298-
tx=localtime((time_t*)&time);
299-
tx->tm_isdst=0;
300-
}
301-
#endif
302-
}
303293
else
304-
{
305294
tx=gmtime((time_t*)&time);
306-
};
307295

308296
tm->tm_year=tx->tm_year+1900;
309297
tm->tm_mon=tx->tm_mon+1;

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

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $Header: /cvsroot/pgsql/src/backend/utils/adt/timestamp.c,v 1.74 2002/09/21 19:52:41 tgl Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/utils/adt/timestamp.c,v 1.75 2002/11/12 00:39:08 tgl Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -906,14 +906,6 @@ timestamp2tm(Timestamp dt, int *tzp, struct tm * tm, fsec_t *fsec, char **tzn)
906906

907907
#if defined(HAVE_TM_ZONE)|| defined(HAVE_INT_TIMEZONE)
908908
tx=localtime(&utime);
909-
#ifdefNO_MKTIME_BEFORE_1970
910-
if (tx->tm_year<70&&tx->tm_isdst==1)
911-
{
912-
utime-=3600;
913-
tx=localtime(&utime);
914-
tx->tm_isdst=0;
915-
}
916-
#endif
917909
tm->tm_year=tx->tm_year+1900;
918910
tm->tm_mon=tx->tm_mon+1;
919911
tm->tm_mday=tx->tm_mday;

‎src/include/port/aix.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#defineCLASS_CONFLICT
22
#defineDISABLE_XOPEN_NLS
33
#defineHAS_TEST_AND_SET
4-
#defineNO_MKTIME_BEFORE_1970
4+
55
typedefunsignedintslock_t;
66

77
#include<sys/machine.h>/* ENDIAN definitions for network

‎src/include/port/irix5.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
#defineHAS_TEST_AND_SET
2-
#defineNO_MKTIME_BEFORE_1970
2+
33
typedefunsigned longslock_t;

‎src/test/regress/resultmap

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
abstime/alpha.*-dec-osf=abstime-solaris-1947
2+
abstime/.*-irix=abstime-solaris-1947
23
abstime/i.86-pc-solaris=abstime-solaris-1947
34
abstime/sparc-sun-solaris=abstime-solaris-1947
45
abstime/.*-sco=abstime-solaris-1947
@@ -21,17 +22,18 @@ geometry/hppa.*-hpux10=geometry-positive-zeros
2122
geometry/.*-irix6=geometry-positive-zeros
2223
horology/.*-aix4=horology-no-DST-before-1970
2324
horology/.*-aix5=horology-no-DST-before-1970
24-
horology/.*-irix6=horology-no-DST-before-1970
2525
horology/alpha.*-dec-osf=horology-solaris-1947
2626
horology/.*-cygwin=horology-no-DST-before-1970
2727
horology/hppa=horology-no-DST-before-1970
28+
horology/.*-irix=horology-solaris-1947
2829
horology/i.86-pc-solaris=horology-solaris-1947
2930
horology/sparc-sun-solaris=horology-solaris-1947
3031
horology/sparc-sun-sunos4.*=horology-no-DST-before-1970
3132
horology/.*-sysv5=horology-solaris-1947
3233
horology/.*-sco=horology-solaris-1947
3334
int8/.*-qnx=int8-exp-three-digits
3435
tinterval/alpha.*-dec-osf=tinterval-solaris-1947
36+
tinterval/.*-irix=tinterval-solaris-1947
3537
tinterval/i.86-pc-solaris=tinterval-solaris-1947
3638
tinterval/sparc-sun-solaris=tinterval-solaris-1947
3739
tinterval/.*-sysv5=tinterval-solaris-1947

0 commit comments

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