diff options
author | Bob Weinand <bobwei9@hotmail.com> | 2014-10-27 13:19:33 +0100 |
---|---|---|
committer | Bob Weinand <bobwei9@hotmail.com> | 2014-10-27 13:19:33 +0100 |
commit | a3ae40152490eacdced73408b9978c8ba31d0179 (patch) | |
tree | 8843a1281853e282671797488c9d80caf337542b /sapi/phpdbg/phpdbg.h | |
parent | 2233625e02374339a7d10876b353c158fa39a5f9 (diff) | |
parent | 6eab2b910120e0ff5f0cdbbeac9be02e13312497 (diff) | |
download | php-git-a3ae40152490eacdced73408b9978c8ba31d0179.tar.gz |
Merge remote-tracking branch 'origin/PHP-5.6'
Diffstat (limited to 'sapi/phpdbg/phpdbg.h')
-rw-r--r-- | sapi/phpdbg/phpdbg.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/sapi/phpdbg/phpdbg.h b/sapi/phpdbg/phpdbg.h index 60bc31a405..64b6aab3ef 100644 --- a/sapi/phpdbg/phpdbg.h +++ b/sapi/phpdbg/phpdbg.h @@ -29,8 +29,12 @@ # define PHPDBG_API #endif -#include <stdint.h> -#include <stddef.h> +#ifndef PHP_WIN32 +# include <stdint.h> +# include <stddef.h> +#else +# include "win32/php_stdint.h" +#endif #include "php.h" #include "php_globals.h" #include "php_variables.h" @@ -50,7 +54,6 @@ #if defined(_WIN32) && !defined(__MINGW32__) # include <windows.h> # include "config.w32.h" -# include "win32/php_stdint.h" # undef strcasecmp # undef strncasecmp # define strcasecmp _stricmp |