diff options
| author | Sriram Natarajan <srinatar@php.net> | 2010-07-27 21:42:22 +0000 |
|---|---|---|
| committer | Sriram Natarajan <srinatar@php.net> | 2010-07-27 21:42:22 +0000 |
| commit | a0bf0739a979d2848f83d756865981957419d473 (patch) | |
| tree | 41772e750ab2c062f24d7acdb44ce87c30a9c55a | |
| parent | ed4f6dbd36e14aa9af23e7fa37b7da7f18865e46 (diff) | |
| download | php-git-a0bf0739a979d2848f83d756865981957419d473.tar.gz | |
- Fixed bug #52436 (Compile error in pcre if systems do not have stdint.h)
# PCRE's config.h can very well reuse the definitions made available from
# PHP's configure script output available within php_config.h
| -rw-r--r-- | NEWS | 3 | ||||
| -rw-r--r-- | ext/pcre/pcrelib/config.h | 7 |
2 files changed, 10 insertions, 0 deletions
@@ -2,6 +2,9 @@ PHP NEWS ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| ?? ??? 2010, PHP 5.3.4 +- Fixed bug #52436 (Compile error if systems do not have stdint.h) + (Sriram Natarajan) + 22 Jul 2010, PHP 5.3.3 - Upgraded bundled sqlite to version 3.6.23.1. (Ilia) - Upgraded bundled PCRE to version 8.02. (Ilia) diff --git a/ext/pcre/pcrelib/config.h b/ext/pcre/pcrelib/config.h index 34d16a468f..277c1e7688 100644 --- a/ext/pcre/pcrelib/config.h +++ b/ext/pcre/pcrelib/config.h @@ -1,5 +1,7 @@ #include <php_compat.h> +#include <php_config.h> + #undef PACKAGE_NAME #undef PACKAGE_VERSION #undef PACKAGE_TARNAME @@ -18,6 +20,8 @@ # define PCRE_EXP_DATA_DEFN __attribute__ ((visibility("default"))) #endif +/* Exclude these below definitions when building within PHP */ +#ifndef ZEND_API /* config.h. Generated from config.h.in by configure. */ /* config.h.in. Generated from configure.ac by autoheader. */ @@ -189,6 +193,9 @@ them both to 0; an emulation function will be used. */ /* Define to 1 if you have `_strtoi64'. */ /* #undef HAVE__STRTOI64 */ +/* Exclude these above definitions when building within PHP */ +#endif + /* The value of LINK_SIZE determines the number of bytes used to store links as offsets within the compiled regex. The default is 2, which allows for compiled patterns up to 64K long. This covers the vast majority of cases. |