From a5d80cb0cf2b1f4ea7e0f486a7e9d53bf35920e5 Mon Sep 17 00:00:00 2001
From: Bruce Momjian <bruce@momjian.us>
Date: Tue, 8 Jul 1997 22:06:46 +0000
Subject: [PATCH] Date-type fixes from Tatsuo Ishii

---
 src/backend/utils/adt/dt.c       | 4 ++--
 src/backend/utils/adt/nabstime.c | 5 ++++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/backend/utils/adt/dt.c b/src/backend/utils/adt/dt.c
index 809e39c749..4067dc2f82 100644
--- a/src/backend/utils/adt/dt.c
+++ b/src/backend/utils/adt/dt.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/dt.c,v 1.27 1997/07/01 00:22:43 thomas Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/dt.c,v 1.28 1997/07/08 22:06:36 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -2118,7 +2118,7 @@ printf( "datetime2tm- (localtime) %d.%02d.%02d %02d:%02d:%02.0f %s dst=%d\n",
 	    tm->tm_gmtoff = tx->tm_gmtoff;
 	    tm->tm_zone = tx->tm_zone;
 
-	    *tzp = (tm->tm_isdst? (tm->tm_gmtoff - 3600): tm->tm_gmtoff); /* tm_gmtoff is Sun/DEC-ism */
+	    *tzp = -(tm->tm_gmtoff); /* tm_gmtoff is Sun/DEC-ism */
 	    if (tzn != NULL) *tzn = tm->tm_zone;
 #endif
 
diff --git a/src/backend/utils/adt/nabstime.c b/src/backend/utils/adt/nabstime.c
index 1e7783713e..88cf2147a2 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.27 1997/06/23 14:56:15 thomas Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/utils/adt/nabstime.c,v 1.28 1997/07/08 22:06:46 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -149,6 +149,9 @@ printf( "datetime2tm- (localtime) %d.%02d.%02d %02d:%02d:%02d %s dst=%d\n",
     if (tzp != NULL) *tzp = (tm->tm_isdst? (timezone - 3600): timezone);
     if (tzn != NULL) strcpy( tzn, tzname[tm->tm_isdst]);
 #else /* !HAVE_INT_TIMEZONE */
+    tm->tm_gmtoff = tx->tm_gmtoff;
+    tm->tm_zone = tx->tm_zone;
+
     if (tzp != NULL) *tzp = - tm->tm_gmtoff;	/* tm_gmtoff is Sun/DEC-ism */
     /* XXX FreeBSD man pages indicate that this should work - tgl 97/04/23 */
     if (tzn != NULL) strcpy( tzn, tm->tm_zone);
-- 
2.11.0