Commite97c817

committed

Use _timezone global on Cygwin instead of timezone.

1 parentcef30c6 commite97c817Copy full SHA for e97c817

File tree

+21

-17

lines changed

+21

-17

lines changed

Lines changed: 6 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`# Macros that test various C library quirks`
`2`		`-# $PostgreSQL: pgsql/config/c-library.m4,v 1.26 2004/06/07 22:39:44 momjian Exp $`
	`2`	`+# $PostgreSQL: pgsql/config/c-library.m4,v 1.27 2004/09/08 19:43:00 momjian Exp $`
`3`	`3`
`4`	`4`
`5`	`5`	`# PGAC_VAR_INT_TIMEZONE`
`@@ -10,7 +10,11 @@ AC_DEFUN([PGAC_VAR_INT_TIMEZONE],`
`10`	`10`	`[AC_CACHE_CHECK(forinttimezone,pgac_cv_var_int_timezone,`
`11`	`11`	`[AC_TRY_LINK([#include <time.h>`
`12`	`12`	`int res;],`
`13`		`-[res = timezone / 60;],`
	`13`	`+[#ifndef __CYGWIN__`
	`14`	`+res = timezone / 60;`
	`15`	`+#else`
	`16`	`+res = _timezone / 60;`
	`17`	`+#endif],`
`14`	`18`	`[pgac_cv_var_int_timezone=yes],`
`15`	`19`	`[pgac_cv_var_int_timezone=no])])`
`16`	`20`	`if test x"$pgac_cv_var_int_timezone" = xyes ; then`

Lines changed: 4 additions & 0 deletions

Lines changed: 9 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`* Portions Copyright (c) 1996-2004, PostgreSQL Global Development Group`
`7`	`7`	`* Portions Copyright (c) 1994, Regents of the University of California`
`8`	`8`	`*`
`9`		`- * $PostgreSQL: pgsql/src/include/port.h,v 1.57 2004/08/29 21:08:48 tgl Exp $`
	`9`	`+ * $PostgreSQL: pgsql/src/include/port.h,v 1.58 2004/09/08 19:43:07 momjian Exp $`
`10`	`10`	`*`
`11`	`11`	`*-------------------------------------------------------------------------`
`12`	`12`	`*/`
`@@ -180,6 +180,14 @@ extern intwin32_open(const char *, int,...);`
`180`	`180`	`#definepclose(a) _pclose(a)`
`181`	`181`	`#endif`
`182`	`182`
	`183`	`+/* Global variable holding time zone information. */`
	`184`	`+#if !defined(__CYGWIN__)`
	`185`	`+#defineTIMEZONE_GLOBAL timezone`
	`186`	`+#else`
	`187`	`+#defineTIMEZONE_GLOBAL _timezone`
	`188`	`+#definetzname _tzname/* should be in time.h? */`
	`189`	`+#endif`
	`190`	`+`
`183`	`191`	`externintcopydir(charfromdir,chartodir);`
`184`	`192`
`185`	`193`	`/* Missing rand functions */`

Lines changed: 0 additions & 8 deletions

Original file line number	Diff line number	Diff line change
`@@ -216,14 +216,6 @@ do { \`
`216`	`216`	`} while(0)`
`217`	`217`	`#endif`
`218`	`218`
`219`		`-/* Global variable holding time zone information. */`
`220`		`-#if !defined(__CYGWIN__)&& !defined(WIN32)`
`221`		`-#defineTIMEZONE_GLOBAL timezone`
`222`		`-#else`
`223`		`-#defineTIMEZONE_GLOBAL _timezone`
`224`		`-#definetzname _tzname/* should be in time.h? */`
`225`		`-#endif`
`226`		`-`
`227`	`219`	`/*`
`228`	`220`	`* Date/time validation`
`229`	`221`	`* Include check for leap year.`

Lines changed: 2 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`* Portions Copyright (c) 1996-2004, PostgreSQL Global Development Group`
`7`	`7`	`*`
`8`	`8`	`* IDENTIFICATION`
`9`		`- * $PostgreSQL: pgsql/src/timezone/pgtz.c,v 1.27 2004/09/02 01:15:06 momjian Exp $`
	`9`	`+ * $PostgreSQL: pgsql/src/timezone/pgtz.c,v 1.28 2004/09/08 19:43:12 momjian Exp $`
`10`	`10`	`*`
`11`	`11`	`*-------------------------------------------------------------------------`
`12`	`12`	`*/`
`@@ -96,11 +96,7 @@ get_timezone_offset(struct tm * tm)`
`96`	`96`	`#if defined(HAVE_STRUCT_TM_TM_ZONE)`
`97`	`97`	`returntm->tm_gmtoff;`
`98`	`98`	`#elif defined(HAVE_INT_TIMEZONE)`
`99`		`-#ifdefHAVE_UNDERSCORE_TIMEZONE`
`100`		`-return-_timezone;`
`101`		`-#else`
`102`		`-return-timezone;`
`103`		`-#endif`
	`99`	`+return-TIMEZONE_GLOBAL;`
`104`	`100`	`#else`
`105`	`101`	`#error No way to determine TZ? Can this happen?`
`106`	`102`	`#endif`

Comments

(0)