com php-src: fix min supported versions: win32/build/config.w32.h.in win32/build/confutils.js
| From: | Anatol Belski | Date: | Thu, 22 Dec 2016 11:40:58 +0000 |
| Subject: | com php-src: fix min supported versions: win32/build/config.w32.h.in win32/build/confutils.js | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-96422@lists.php.net to get a copy of this message | ||
Commit: d5a3838c65affe06958843ee115572351e6b41a3
Author: Anatol Belski <ab@php.net> Thu, 22 Dec 2016 12:40:58 +0100
Parents: 4899109e7bfcc5264e651fc7241bb320115def33
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=d5a3838c65affe06958843ee115572351e6b41a3
Log:
fix min supported versions
Changed paths:
M win32/build/config.w32.h.in
M win32/build/confutils.js
Diff:
diff --git a/win32/build/config.w32.h.in b/win32/build/config.w32.h.in
index e871088..573eb95 100644
--- a/win32/build/config.w32.h.in
+++ b/win32/build/config.w32.h.in
@@ -6,8 +6,8 @@
/* Define the minimum supported version */
#undef _WIN32_WINNT
#undef NTDDI_VERSION
-#define _WIN32_WINNT 0x0600
-#define NTDDI_VERSION 0x06000100
+#define _WIN32_WINNT 0x0601
+#define NTDDI_VERSION 0x06010000
/* Default PHP / PEAR directories */
#define PHP_CONFIG_FILE_PATH
(getenv("SystemRoot")?getenv("SystemRoot"):"")
diff --git a/win32/build/confutils.js b/win32/build/confutils.js
index 11915d3..eafc8f3 100644
--- a/win32/build/confutils.js
+++ b/win32/build/confutils.js
@@ -44,6 +44,7 @@ var PHP_TEST_INI_PATH = "";
var PHP_TEST_INI = "";
var PHP_TEST_INI_EXT_EXCLUDE = "";
+/* Care also about NTDDI_VERSION and _WIN32_WINNT in config.w32.h.in */
var WINVER = "0x0601"; /* 7/2008r2 */
// There's a minimum requirement for re2c..
@@ -3027,7 +3028,7 @@ function toolset_setup_common_cflags()
{
// CFLAGS for building the PHP dll
DEFINE("CFLAGS_PHP", "/D _USRDLL /D PHP7DLLTS_EXPORTS /D PHP_EXPORTS \
- /D LIBZEND_EXPORTS /D TSRM_EXPORTS /D SAPI_EXPORTS /D _WIN32_WINNT=" + WINVER);
+ /D LIBZEND_EXPORTS /D TSRM_EXPORTS /D SAPI_EXPORTS /D WINVER=" + WINVER);
DEFINE('CFLAGS_PHP_OBJ', '$(CFLAGS_PHP) $(STATIC_EXT_CFLAGS)');