diff options
| author | Nikita Popov <nikic@php.net> | 2012-08-20 13:37:53 +0200 |
|---|---|---|
| committer | Nikita Popov <nikic@php.net> | 2012-08-20 13:37:53 +0200 |
| commit | 1823b16fa15894f72fc01724766289dbecf5a62a (patch) | |
| tree | 1b7d21c15a1003a8c5631a15393d906c0ef3482f /sapi/cli/php_http_parser.h | |
| parent | 9003cd142553384c3d271b12407186d5352868ad (diff) | |
| parent | 9ccf85419849db587a973673e382faf3b3a9db43 (diff) | |
| download | php-git-1823b16fa15894f72fc01724766289dbecf5a62a.tar.gz | |
Merge remote-tracking branch 'php-src/master' into addGeneratorsSupport
Merging master to fix Windows build
Conflicts:
Zend/zend_language_scanner.c
Zend/zend_language_scanner_defs.h
Zend/zend_vm_def.h
Diffstat (limited to 'sapi/cli/php_http_parser.h')
| -rw-r--r-- | sapi/cli/php_http_parser.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sapi/cli/php_http_parser.h b/sapi/cli/php_http_parser.h index b740a0995e..7e72b78d7d 100644 --- a/sapi/cli/php_http_parser.h +++ b/sapi/cli/php_http_parser.h @@ -32,7 +32,10 @@ extern "C" { # include "win32/php_stdint.h" # include "config.w32.h" #else -# include <stdint.h> +# include "php_config.h" +# ifdef HAVE_STDINT_H +# include <stdint.h> +# endif #endif /* Compile with -DPHP_HTTP_PARSER_STRICT=0 to make less checks, but run |