diff options
| author | Nigel Metheringham <nigel@exim.org> | 2011-01-26 11:04:32 +0000 |
|---|---|---|
| committer | Nigel Metheringham <nigel@exim.org> | 2011-01-26 11:04:32 +0000 |
| commit | aa097c4c00f62487128d74f65c521f9e877b184f (patch) | |
| tree | 6078a7cbc0026042981e268b79039411c034de0a | |
| parent | 88d5edb00796448347da8544088b0db1f9b61ddf (diff) | |
Workround compile error with old PCRE versions
Fixes bug #1073
| -rw-r--r-- | doc/doc-txt/ChangeLog | 7 | ||||
| -rw-r--r-- | src/src/exim.c | 7 |
2 files changed, 13 insertions, 1 deletions
diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog index b18bc053e..96cec2460 100644 --- a/doc/doc-txt/ChangeLog +++ b/doc/doc-txt/ChangeLog @@ -3,6 +3,13 @@ $Cambridge: exim/doc/doc-txt/ChangeLog,v 1.632 2010/06/12 15:21:25 jetmore Exp $ Change log file for Exim from version 4.21 ------------------------------------------- +Exim version 4.75 +----------------- + +NM/01 Workround for PCRE version dependancy in version reporting + Bugzilla 1073 + + Exim version 4.74 ----------------- diff --git a/src/src/exim.c b/src/src/exim.c index e23697506..b3035ca7c 100644 --- a/src/src/exim.c +++ b/src/src/exim.c @@ -931,8 +931,13 @@ DEBUG(D_any) do { " Runtime: %s\n", PCRE_MAJOR, PCRE_MINOR, /* PRE_PRERELEASE is either defined and empty or a string. - * This should work: */ + * unless its an ancient version of PCRE in which case it + * is not defined */ +#ifdef PCRE_PRERELEASE PCRE_PRERELEASE "", +#else + "", +#endif pcre_version()); init_lookup_list(); |