diff options
| author | Robert Haas | 2016-03-29 00:59:25 +0000 |
|---|---|---|
| committer | Robert Haas | 2016-03-29 00:59:25 +0000 |
| commit | 868628e4fd44d75987d6c099ac63613cc5417629 (patch) | |
| tree | dd17232df1c8b42f451fcf4e4e640f602aee7af1 | |
| parent | bd0f206f5588767aac2456ebf6a21f7a6344cd58 (diff) | |
On all Windows platforms, not just Cygwin, use _timezone and _tzname.
Up until now, we've been using timezone and tzname, but Visual Studio
2015 (for which we wish to add support) no longer declares those
symbols. All versions since Visual Studio 2003 apparently support the
underscore-equipped names, and we don't support anything older than
Visual Studio 2005, so this should work OK everywhere. But let's see
what the buildfarm thinks.
Michael Paquier, reviewed by Petr Jelinek
| -rw-r--r-- | src/include/port.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/include/port.h b/src/include/port.h index cb13dd80c7..455f72338c 100644 --- a/src/include/port.h +++ b/src/include/port.h @@ -214,12 +214,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__) |