diff options
| author | Anatoliy Belsky <ab@php.net> | 2012-10-19 09:49:28 +0200 |
|---|---|---|
| committer | Anatoliy Belsky <ab@php.net> | 2012-10-19 09:49:28 +0200 |
| commit | 276c5de0d86abab52a19f489dd74565fdec0d3ca (patch) | |
| tree | 7b3b16c9ce208a34968f39dad680c42ad4ba7a6f /ext/pcre/pcrelib/pcre_version.c | |
| parent | 90bd54c46e0195f65a1a49ac0c01f139915a2dd3 (diff) | |
| download | php-git-276c5de0d86abab52a19f489dd74565fdec0d3ca.tar.gz | |
Fixed bug #63284 PCRE upgrade to 8.31
Diffstat (limited to 'ext/pcre/pcrelib/pcre_version.c')
| -rw-r--r-- | ext/pcre/pcrelib/pcre_version.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/ext/pcre/pcrelib/pcre_version.c b/ext/pcre/pcrelib/pcre_version.c index bd63f41e6e..3dd60a5bc2 100644 --- a/ext/pcre/pcrelib/pcre_version.c +++ b/ext/pcre/pcrelib/pcre_version.c @@ -6,7 +6,7 @@ and semantics are as close as possible to those of the Perl 5 language. Written by Philip Hazel - Copyright (c) 1997-2008 University of Cambridge + Copyright (c) 1997-2012 University of Cambridge ----------------------------------------------------------------------------- Redistribution and use in source and binary forms, with or without @@ -77,8 +77,13 @@ 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 PCRE_EXP_DEFN const char * PCRE_CALL_CONVENTION pcre_version(void) +#else +PCRE_EXP_DEFN const char * PCRE_CALL_CONVENTION +pcre16_version(void) +#endif { return (XSTRING(Z PCRE_PRERELEASE)[1] == 0)? XSTRING(PCRE_MAJOR.PCRE_MINOR PCRE_DATE) : |