diff options
| author | Anatol Belski <ab@php.net> | 2016-11-12 02:39:30 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2016-11-12 02:39:30 +0100 |
| commit | 595ad898c1b1f584dce5dc65d50bdb356e20f6a5 (patch) | |
| tree | 20e82bb63360f24766c6fd828025a5f3cc28649d | |
| parent | 0d253769001a623cfbdcea317c60b3e0cabf4c16 (diff) | |
| parent | 8486e045db8bcde2c6bb4e0d2fbbe30fafd0dd3c (diff) | |
| download | php-git-595ad898c1b1f584dce5dc65d50bdb356e20f6a5.tar.gz | |
Merge branch 'PHP-7.1'
* PHP-7.1:
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 a54e894b46..abc858ee5c 100644 --- a/win32/build/confutils.js +++ b/win32/build/confutils.js @@ -3021,7 +3021,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"); |