From 6acdebbd3a6e516e26b9d5ff7c51e51802e7345b Mon Sep 17 00:00:00 2001
From: "Thomas G. Lockhart" <lockhart@fourpalms.org>
Date: Thu, 18 Jan 2001 07:22:43 +0000
Subject: Fix up "Postgres-style" time interval representation when fields have
  mixed-signs. Previous effort left way too many minus signs, and was at 
 least as broken as the one before that :( Clean up "ISO-style" time interval
 representation to omit zero fields if  there is at least one non-zero field.
 Supress some leading plus signs  when not necessary for clarity. Replace
 every #ifdef __CYGWIN__ block with a cleaner TIMEZONE_GLOBAL macro  defined
 in datetime.h.

---
 src/backend/utils/adt/formatting.c | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

(limited to 'src/backend/utils/adt/formatting.c')

diff --git a/src/backend/utils/adt/formatting.c b/src/backend/utils/adt/formatting.c
index 7996c47f58f..79699839c33 100644
--- a/src/backend/utils/adt/formatting.c
+++ b/src/backend/utils/adt/formatting.c
@@ -1,7 +1,7 @@
 /* -----------------------------------------------------------------------
  * formatting.c
  *
- * $Header: /cvsroot/pgsql/src/backend/utils/adt/formatting.c,v 1.29 2001/01/17 16:46:56 thomas Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/adt/formatting.c,v 1.30 2001/01/18 07:22:36 thomas Exp $
  *
  *
  *	 Portions Copyright (c) 1999-2000, PostgreSQL, Inc
@@ -2931,13 +2931,7 @@ to_timestamp(PG_FUNCTION_ARGS)
 # if defined(HAVE_TM_ZONE)
 		tz = -(tm->tm_gmtoff);	/* tm_gmtoff is Sun/DEC-ism */
 # elif defined(HAVE_INT_TIMEZONE)
-
-#  ifdef __CYGWIN__
-		tz = ((tm->tm_isdst > 0) ? (_timezone - 3600) : _timezone);
-#  else
-		tz = ((tm->tm_isdst > 0) ? (timezone - 3600) : timezone);
-#  endif
-
+		tz = ((tm->tm_isdst > 0) ? (TIMEZONE_GLOBAL - 3600) : TIMEZONE_GLOBAL);
 # endif
 
 #else /* not (HAVE_TM_ZONE || HAVE_INT_TIMEZONE) */
-- 
cgit v1.2.3