diff options
| author | Anatol Belski <ab@php.net> | 2013-03-03 19:06:22 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2013-03-03 19:06:22 +0100 |
| commit | 357ab3cbada57374075ccf57c9ec25bbbbcb6948 (patch) | |
| tree | f8c61f2068629b070bf82ada4ad2b2adc44516ba /ext/pcre/pcrelib/pcre_version.c | |
| parent | c134f2a1a5ef56da72dbdc1096eddc91e4f5939e (diff) | |
| download | php-git-357ab3cbada57374075ccf57c9ec25bbbbcb6948.tar.gz | |
merged PCRE 8.32
- defined HAVE_CONFIG_H to simplify the future merges
- PCRE NEWS http://pcre.org/news.txt
Diffstat (limited to 'ext/pcre/pcrelib/pcre_version.c')
| -rw-r--r-- | ext/pcre/pcrelib/pcre_version.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/ext/pcre/pcrelib/pcre_version.c b/ext/pcre/pcrelib/pcre_version.c index 3dd60a5bc2..ae86ff28bc 100644 --- a/ext/pcre/pcrelib/pcre_version.c +++ b/ext/pcre/pcrelib/pcre_version.c @@ -42,7 +42,9 @@ POSSIBILITY OF SUCH DAMAGE. string that identifies the PCRE version that is in use. */ +#ifdef HAVE_CONFIG_H #include "config.h" +#endif #include "pcre_internal.h" @@ -77,12 +79,15 @@ I could find no way of detecting that a macro is defined as an empty string at pre-processor time. This hack uses a standard trick for avoiding calling the STRING macro with an empty argument when doing the test. */ -#ifdef COMPILE_PCRE8 +#if defined COMPILE_PCRE8 PCRE_EXP_DEFN const char * PCRE_CALL_CONVENTION pcre_version(void) -#else +#elif defined COMPILE_PCRE16 PCRE_EXP_DEFN const char * PCRE_CALL_CONVENTION pcre16_version(void) +#elif defined COMPILE_PCRE32 +PCRE_EXP_DEFN const char * PCRE_CALL_CONVENTION +pcre32_version(void) #endif { return (XSTRING(Z PCRE_PRERELEASE)[1] == 0)? |