diff options
| author | ph10 <ph10@2f5784b3-3f2a-0410-8824-cb99058d5e15> | 2011-12-28 17:16:11 +0000 |
|---|---|---|
| committer | ph10 <ph10@2f5784b3-3f2a-0410-8824-cb99058d5e15> | 2011-12-28 17:16:11 +0000 |
| commit | 5e8b286b566d7ec502b80892e5b709025631d58c (patch) | |
| tree | c8a6c83ad13e79a9b64718b784fe0126764d98b7 /pcre_version.c | |
| parent | a29cc4dc66d82b59de7616c53517c58271e6e0e8 (diff) | |
| download | pcre-5e8b286b566d7ec502b80892e5b709025631d58c.tar.gz | |
Merging all the changes from the pcre16 branch into the trunk.
git-svn-id: svn://vcs.exim.org/pcre/code/trunk@836 2f5784b3-3f2a-0410-8824-cb99058d5e15
Diffstat (limited to 'pcre_version.c')
| -rw-r--r-- | pcre_version.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/pcre_version.c b/pcre_version.c index 7067cd4..58a0eaa 100644 --- a/pcre_version.c +++ b/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 @@ -79,8 +79,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) : |