diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2002-11-12 00:39:36 +0000 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2002-11-12 00:39:36 +0000 |
| commit | 400013ceecb27c9582a6d9e8d48930a47d0b7a85 (patch) | |
| tree | daaaa8360e708e8302ff7d027a10a68c13dfc058 /src/backend/utils | |
| parent | 4d3fb9ce6e1c85964335d7b4942dc0e8080c9ce5 (diff) | |
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 going
to extrapolate to AIX as well.
Diffstat (limited to 'src/backend/utils')
| -rw-r--r-- | src/backend/utils/adt/nabstime.c | 14 | ||||
| -rw-r--r-- | src/backend/utils/adt/timestamp.c | 10 |
2 files changed, 2 insertions, 22 deletions
diff --git a/src/backend/utils/adt/nabstime.c b/src/backend/utils/adt/nabstime.c index ae929c76ec2..0e57ec72a28 100644 --- a/src/backend/utils/adt/nabstime.c +++ b/src/backend/utils/adt/nabstime.c @@ -9,7 +9,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/nabstime.c,v 1.100 2002/10/04 17:34:01 tgl Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/nabstime.c,v 1.100.2.1 2002/11/12 00:39:36 tgl Exp $ * * NOTES * @@ -289,21 +289,9 @@ abstime2tm(AbsoluteTime _time, int *tzp, struct tm * tm, char **tzn) #if defined(HAVE_TM_ZONE) || defined(HAVE_INT_TIMEZONE) if ((!HasCTZSet) && (tzp != NULL)) - { tx = localtime((time_t *) &time); -#ifdef NO_MKTIME_BEFORE_1970 - if (tx->tm_year < 70 && tx->tm_isdst == 1) - { - time -= 3600; - tx = localtime((time_t *) &time); - tx->tm_isdst = 0; - } -#endif - } else - { tx = gmtime((time_t *) &time); - }; tm->tm_year = tx->tm_year + 1900; tm->tm_mon = tx->tm_mon + 1; diff --git a/src/backend/utils/adt/timestamp.c b/src/backend/utils/adt/timestamp.c index 2c8f882e384..2fe99308c05 100644 --- a/src/backend/utils/adt/timestamp.c +++ b/src/backend/utils/adt/timestamp.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/timestamp.c,v 1.74 2002/09/21 19:52:41 tgl Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/timestamp.c,v 1.74.2.1 2002/11/12 00:39:36 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -906,14 +906,6 @@ timestamp2tm(Timestamp dt, int *tzp, struct tm * tm, fsec_t *fsec, char **tzn) #if defined(HAVE_TM_ZONE) || defined(HAVE_INT_TIMEZONE) tx = localtime(&utime); -#ifdef NO_MKTIME_BEFORE_1970 - if (tx->tm_year < 70 && tx->tm_isdst == 1) - { - utime -= 3600; - tx = localtime(&utime); - tx->tm_isdst = 0; - } -#endif tm->tm_year = tx->tm_year + 1900; tm->tm_mon = tx->tm_mon + 1; tm->tm_mday = tx->tm_mday; |