aboutsummaryrefslogtreecommitdiff
path: root/src/backend/utils
diff options
context:
space:
mode:
authorTom Lane <tgl@sss.pgh.pa.us>2002-11-12 00:39:08 +0000
committerTom Lane <tgl@sss.pgh.pa.us>2002-11-12 00:39:08 +0000
commit5eb6de5991eb53594d3d725c7218e9a9c53f7d84 (patch)
tree50e9f2c6504fb40e6fb48f745131379a34b60483 /src/backend/utils
parentf9b5b41ef993a9b76b7f97b271df8034f1a24154 (diff)
downloadpostgresql-5eb6de5991eb53594d3d725c7218e9a9c53f7d84.tar.gz
postgresql-5eb6de5991eb53594d3d725c7218e9a9c53f7d84.zip
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.c14
-rw-r--r--src/backend/utils/adt/timestamp.c10
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..a6aa8a42b3b 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.101 2002/11/12 00:39:08 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..885d3992fd4 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.75 2002/11/12 00:39:08 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;