diff options
| author | Anatol Belski <ab@php.net> | 2016-11-12 02:38:33 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2016-11-12 02:38:33 +0100 |
| commit | 8486e045db8bcde2c6bb4e0d2fbbe30fafd0dd3c (patch) | |
| tree | 3da870f274e2c502904e518720d199482f036cd0 | |
| parent | 3c8beb16c4a127b4fea0a5b5d9e853f4e41dbbd7 (diff) | |
| parent | 81fed377847b401600abcb549e088d4050a2c803 (diff) | |
| download | php-git-8486e045db8bcde2c6bb4e0d2fbbe30fafd0dd3c.tar.gz | |
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
fix erroneous line in confutils.js
| -rw-r--r-- | win32/build/confutils.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/win32/build/confutils.js b/win32/build/confutils.js index aebae315c4..5bb6a49dfd 100644 --- a/win32/build/confutils.js +++ b/win32/build/confutils.js @@ -2999,7 +2999,7 @@ function toolset_setup_common_cflags() /D LIBZEND_EXPORTS /D TSRM_EXPORTS /D SAPI_EXPORTS /D WINVER=" + WINVER); DEFINE('CFLAGS_PHP_OBJ', '$(CFLAGS_PHP) $(STATIC_EXT_CFLAGS)'); -1 + // General CFLAGS for building objects DEFINE("CFLAGS", "/nologo $(BASE_INCLUDES) /D _WINDOWS \ /D ZEND_WIN32=1 /D PHP_WIN32=1 /D WIN32 /D _MBCS /W3"); |