From 520711d6e23e313bb2b3de39667a6596953ceed0 Mon Sep 17 00:00:00 2001 From: Tom Lane Date: Tue, 1 May 2018 12:02:41 -0400 Subject: [PATCH] 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 Now that we have backported VS2015 support to 9.4 and 9.3, backport this also. --- src/include/port.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/include/port.h b/src/include/port.h index cdcc19a32c..f78e68f075 100644 --- a/src/include/port.h +++ b/src/include/port.h @@ -255,12 +255,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__) -- 2.40.0