diff options
Diffstat (limited to 'sapi')
| -rw-r--r-- | sapi/apache2handler/apache_config.c | 6 | ||||
| -rw-r--r-- | sapi/apache2handler/mod_php.c | 6 | ||||
| -rw-r--r-- | sapi/apache2handler/php_functions.c | 6 | ||||
| -rw-r--r-- | sapi/apache2handler/sapi_apache2.c | 6 | ||||
| -rw-r--r-- | sapi/phpdbg/phpdbg.c | 2 | ||||
| -rw-r--r-- | sapi/phpdbg/phpdbg_prompt.c | 2 |
6 files changed, 26 insertions, 2 deletions
diff --git a/sapi/apache2handler/apache_config.c b/sapi/apache2handler/apache_config.c index b7e0077d2d..0079ac7fea 100644 --- a/sapi/apache2handler/apache_config.c +++ b/sapi/apache2handler/apache_config.c @@ -17,6 +17,12 @@ #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS #include "php.h" +#ifdef strcasecmp +# undef strcasecmp +#endif +#ifdef strncasecmp +# undef strncasecmp +#endif #include "php_ini.h" #include "php_apache.h" diff --git a/sapi/apache2handler/mod_php.c b/sapi/apache2handler/mod_php.c index 835c5f5c90..e8e97fabeb 100644 --- a/sapi/apache2handler/mod_php.c +++ b/sapi/apache2handler/mod_php.c @@ -19,6 +19,12 @@ #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS #include "php.h" +#ifdef strcasecmp +# undef strcasecmp +#endif +#ifdef strncasecmp +# undef strncasecmp +#endif #include "php_apache.h" AP_MODULE_DECLARE_DATA module php_module = { diff --git a/sapi/apache2handler/php_functions.c b/sapi/apache2handler/php_functions.c index ae0a8553b4..834a079ee8 100644 --- a/sapi/apache2handler/php_functions.c +++ b/sapi/apache2handler/php_functions.c @@ -17,6 +17,12 @@ #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS #include "php.h" +#ifdef strcasecmp +# undef strcasecmp +#endif +#ifdef strncasecmp +# undef strncasecmp +#endif #include "zend_smart_str.h" #include "ext/standard/info.h" #include "ext/standard/head.h" diff --git a/sapi/apache2handler/sapi_apache2.c b/sapi/apache2handler/sapi_apache2.c index b2f32ce49a..52bc44f94a 100644 --- a/sapi/apache2handler/sapi_apache2.c +++ b/sapi/apache2handler/sapi_apache2.c @@ -19,6 +19,12 @@ #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS #include "php.h" +#ifdef strcasecmp +# undef strcasecmp +#endif +#ifdef strncasecmp +# undef strncasecmp +#endif #include "php_main.h" #include "php_ini.h" #include "php_variables.h" diff --git a/sapi/phpdbg/phpdbg.c b/sapi/phpdbg/phpdbg.c index f9777c5adb..78aa34f524 100644 --- a/sapi/phpdbg/phpdbg.c +++ b/sapi/phpdbg/phpdbg.c @@ -2071,7 +2071,7 @@ phpdbg_out: settings->oplog = PHPDBG_G(oplog); settings->prompt[0] = PHPDBG_G(prompt)[0]; settings->prompt[1] = PHPDBG_G(prompt)[1]; - memcpy(settings->colors, PHPDBG_G(colors), sizeof(settings->colors)); + memcpy(ZEND_VOIDP(settings->colors), PHPDBG_G(colors), sizeof(settings->colors)); settings->eol = PHPDBG_G(eol); settings->input_buflen = PHPDBG_G(input_buflen); memcpy(settings->input_buffer, PHPDBG_G(input_buffer), settings->input_buflen); diff --git a/sapi/phpdbg/phpdbg_prompt.c b/sapi/phpdbg/phpdbg_prompt.c index 3c26fa7ef4..14e09d7243 100644 --- a/sapi/phpdbg/phpdbg_prompt.c +++ b/sapi/phpdbg/phpdbg_prompt.c @@ -1707,7 +1707,7 @@ void phpdbg_execute_ex(zend_execute_data *execute_data) /* {{{ */ #ifdef ZEND_WIN32 if (EG(timed_out)) { - zend_timeout(0); + zend_timeout(); } #endif |