[exim-cvs] Workround compile error with old PCRE versions

Páxina inicial
Borrar esta mensaxe
Responder a esta mensaxe
Autor: Exim Git Commits Mailing List
Data:  
Para: exim-cvs
Asunto: [exim-cvs] Workround compile error with old PCRE versions
Gitweb: http://git.exim.org/exim.git/commitdiff/aa097c4c00f62487128d74f65c521f9e877b184f
Commit:     aa097c4c00f62487128d74f65c521f9e877b184f
Parent:     88d5edb00796448347da8544088b0db1f9b61ddf
Author:     Nigel Metheringham <nigel@???>
AuthorDate: Wed Jan 26 11:04:32 2011 +0000
Committer:  Nigel Metheringham <nigel@???>
CommitDate: Wed Jan 26 11:04:32 2011 +0000


    Workround compile error with old PCRE versions


    Fixes bug #1073
---
 doc/doc-txt/ChangeLog |    7 +++++++
 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 b18bc05..96cec24 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 e236975..b3035ca 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();