Commitb70999d

committed

Make TZNAME_GLOBAL for reference to tzname global variable.

1 parentf62901c commitb70999dCopy full SHA for b70999d

File tree

-5

lines changed

-5

lines changed

Lines changed: 3 additions & 2 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`	`* Portions Copyright (c) 1994, Regents of the University of California`
`8`	`8`	`*`
`9`		`- * $PostgreSQL: pgsql/src/include/port.h,v 1.58 2004/09/08 19:43:07 momjian Exp $`
	`9`	`+ * $PostgreSQL: pgsql/src/include/port.h,v 1.59 2004/09/09 00:24:10 momjian Exp $`
`10`	`10`	`*`
`11`	`11`	`*-------------------------------------------------------------------------`
`12`	`12`	`*/`
`@@ -183,9 +183,10 @@ extern intwin32_open(const char *, int,...);`
`183`	`183`	`/* Global variable holding time zone information. */`
`184`	`184`	`#if !defined(__CYGWIN__)`
`185`	`185`	`#defineTIMEZONE_GLOBAL timezone`
	`186`	`+#defineTZNAME_GLOBAL tzname`
`186`	`187`	`#else`
`187`	`188`	`#defineTIMEZONE_GLOBAL _timezone`
`188`		`-#definetzname _tzname/* should be in time.h? */`
	`189`	`+#defineTZNAME_GLOBAL _tzname`
`189`	`190`	`#endif`
`190`	`191`
`191`	`192`	`externintcopydir(charfromdir,chartodir);`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1065,8 +1065,8 @@ abstime2tm(AbsoluteTime _time, int tzp, struct tm tm, char **tzn)`
`1065`	`1065`	`* case it contains an error message, which doesn't fit in the`
`1066`	`1066`	`* buffer`
`1067`	`1067`	`*/`
`1068`		`-StrNCpy(*tzn,tzname[tm->tm_isdst],MAXTZLEN+1);`
`1069`		`-if (strlen(tzname[tm->tm_isdst])>MAXTZLEN)`
	`1068`	`+StrNCpy(*tzn,TZNAME_GLOBAL[tm->tm_isdst],MAXTZLEN+1);`
	`1069`	`+if (strlen(TZNAME_GLOBAL[tm->tm_isdst])>MAXTZLEN)`
`1070`	`1070`	`tm->tm_isdst=-1;`
`1071`	`1071`	`}`
`1072`	`1072`	`}`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -223,7 +223,7 @@ timestamp2tm(timestamp dt, int tzp, struct tm tm, fsec_t fsec, char *tzn)`
`223`	`223`	`#elif defined(HAVE_INT_TIMEZONE)`
`224`	`224`	`*tzp= ((tm->tm_isdst>0) ? (TIMEZONE_GLOBAL-3600) :TIMEZONE_GLOBAL);`
`225`	`225`	`if (tzn!=NULL)`
`226`		`-*tzn=tzname[(tm->tm_isdst>0)];`
	`226`	`+*tzn=TZNAME_GLOBAL[(tm->tm_isdst>0)];`
`227`	`227`	`#endif`
`228`	`228`
`229`	`229`	`#else/* not (HAVE_TM_ZONE \|\| HAVE_INT_TIMEZONE) */`

Comments

(0)