diff options
| author | Anatol Belski <ab@php.net> | 2017-11-30 12:41:44 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2017-11-30 12:41:44 +0100 |
| commit | a415006b5e9735dc9e731816ca0ef18e26402fdf (patch) | |
| tree | 1ff3b7846a6395efd57a120141a4abc2c9b2af22 /sapi/apache2handler | |
| parent | 7067f7ccb40010275c7020949753b412025e3024 (diff) | |
| parent | 23d2bd374838897ec97f9994e70856686a89f132 (diff) | |
| download | php-git-a415006b5e9735dc9e731816ca0ef18e26402fdf.tar.gz | |
Merge branch 'PHP-7.2'
* PHP-7.2:
Fix macro redefinition warnings
Diffstat (limited to 'sapi/apache2handler')
| -rw-r--r-- | sapi/apache2handler/config.w32 | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sapi/apache2handler/config.w32 b/sapi/apache2handler/config.w32 index 8ea1305d4f..13f146fed8 100644 --- a/sapi/apache2handler/config.w32 +++ b/sapi/apache2handler/config.w32 @@ -51,6 +51,7 @@ if (PHP_APACHE2_4HANDLER != "no") { 'php' + PHP_VERSION + 'apache2_4.dll', '/D PHP_APACHE2_EXPORTS /I win32 /DZEND_ENABLE_STATIC_TSRMLS_CACHE=1', 'sapi\\apache2handler'); + ADD_FLAG("CFLAGS_APACHE2_4HANDLER", "/D HAVE_STRCASECMP=1 /D HAVE_STRNCASECMP=1"); } else { WARNING("Could not find apache 2.4 libraries/headers"); } |