com php-src: fix _timezone usage for vc14: ext/ openssl/openssl.c
| From: | Anatol Belski | Date: | Sun, 10 May 2015 16:17:24 +0000 |
| Subject: | com php-src: fix _timezone usage for vc14: ext/ openssl/openssl.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-86662@lists.php.net to get a copy of this message | ||
Commit: c93a3606616aff45560ea4e98e78a3697c783f91
Author: Anatol Belski <ab@php.net> Sat, 9 May 2015 22:57:56 +0200
Parents: cf7e5357a46afe1dca978f4887bbd83a7507ce69
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=c93a3606616aff45560ea4e98e78a3697c783f91
Log:
fix _timezone usage for vc14
Changed paths:
M ext/openssl/openssl.c
Diff:
diff --git a/ext/openssl/openssl.c b/ext/openssl/openssl.c
index 1697d80..1ae7411 100644
--- a/ext/openssl/openssl.c
+++ b/ext/openssl/openssl.c
@@ -59,7 +59,7 @@
/* Common */
#include <time.h>
-#ifdef NETWARE
+#if defined(NETWARE) || (defined(PHP_WIN32) && defined(_MSC_VER) && _MSC_VER >=
1900)
#define timezone _timezone /* timezone is called _timezone in LibC */
#endif