diff options
| author | Bob Weinand <bobwei9@hotmail.com> | 2014-10-27 13:11:13 +0100 |
|---|---|---|
| committer | Bob Weinand <bobwei9@hotmail.com> | 2014-10-27 13:11:13 +0100 |
| commit | 6eab2b910120e0ff5f0cdbbeac9be02e13312497 (patch) | |
| tree | 08d7517c71e5726cda6cb3b5f9cfd37f900f6b5d /sapi/phpdbg/phpdbg.h | |
| parent | cc91072f0ef69b5884f23eb758ef6e12e8858034 (diff) | |
| parent | b4db856d374d0df47e902b65639ab9a06346aa8a (diff) | |
| download | php-git-6eab2b910120e0ff5f0cdbbeac9be02e13312497.tar.gz | |
Merge phpdbg into PHP-5.6
Conflicts:
sapi/phpdbg/phpdbg.c
sapi/phpdbg/phpdbg_prompt.c
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 65bdcd0d6f..2aae533d84 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 |