diff options
| author | Anatol Belski <ab@php.net> | 2015-04-28 14:38:45 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2015-04-28 14:38:45 +0200 |
| commit | 7ccafe40c27336d5770d9158a522a7bc72b355f7 (patch) | |
| tree | 35315620d85a175bddb8823e9f2c2c1d39cd77b5 | |
| parent | e645837ba15185cc3220d9d7fcc6d23e115ad188 (diff) | |
| parent | 768bbedf8233dad6c1709b536f8db20d4496a7cc (diff) | |
| download | php-git-7ccafe40c27336d5770d9158a522a7bc72b355f7.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
fix VC9 build with PCRE
Revert "Fix segfault in ext/date since 957aa2"
| -rw-r--r-- | ext/pcre/pcrelib/pcre_internal.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/ext/pcre/pcrelib/pcre_internal.h b/ext/pcre/pcrelib/pcre_internal.h index 02d3ab17c5..19d18a830a 100644 --- a/ext/pcre/pcrelib/pcre_internal.h +++ b/ext/pcre/pcrelib/pcre_internal.h @@ -229,11 +229,15 @@ stdint.h is available, include it; it may define INT64_MAX. Systems that do not have stdint.h (e.g. Solaris) may have inttypes.h. The macro int64_t may be set by "configure". */ +#ifdef PHP_WIN32 +#include "win32/php_stdint.h" +#else #if defined HAVE_STDINT_H #include <stdint.h> #elif defined HAVE_INTTYPES_H #include <inttypes.h> #endif +#endif #if defined INT64_MAX || defined int64_t #define INT64_OR_DOUBLE int64_t |