On all Windows platforms, not just Cygwin, use _timezone and _tzname.

Back-patch commit 868628e4f into the 9.5 branch, so that we can support
building that branch with Visual Studio 2015.  This patch itself could
go further back, but other VS2015 patches such as 0fb54de9a and c8e81afc6
were only back-patched to 9.5, so there seems little point in handling
this one differently.

Discussion: https://postgr.es/m/CAD=LzWFg+Z-KUS3Wm8-1J2vOuYErJXbjuE6b7quzswQEBXJWMQ@mail.gmail.com

diff --git a/src/include/port.h b/src/include/port.h
index 3787cbfb7614cd318a3885bc59554128fb063502..54baaa78d7c42bf7e1d877df4155ac3819ed85a3 100644 (file)
--- a/src/include/port.h
+++ b/src/include/port.h
@@ -213,12 +213,12 @@ extern int    pgkill(int pid, int sig);
 extern int pclose_check(FILE *stream);
 
 /* Global variable holding time zone information. */
-#ifndef __CYGWIN__
-#define TIMEZONE_GLOBAL timezone
-#define TZNAME_GLOBAL tzname
-#else
+#if defined(WIN32) || defined(__CYGWIN__)
 #define TIMEZONE_GLOBAL _timezone
 #define TZNAME_GLOBAL _tzname
+#else
+#define TIMEZONE_GLOBAL timezone
+#define TZNAME_GLOBAL tzname
 #endif
 
 #if defined(WIN32) || defined(__CYGWIN__)