Workround compile error with old PCRE versions

Fixes bug #1073

diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog
index b18bc053e8a70611b2569b098cd4ce8ced445fb7..96cec24604bea2afbf17dd63a3fc005321f1b4f9 100644 (file)
--- 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
 -------------------------------------------
 
 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
 -----------------
 
 Exim version 4.74
 -----------------
 

diff --git a/src/src/exim.c b/src/src/exim.c
index e236975061be2c14ee851ac0979a200b8cb90ddd..b3035ca7c7f918acb2938f03a1c324e09dd894d9 100644 (file)
--- 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.
              "                       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 "",
           PCRE_PRERELEASE "",

+#else
+          "",
+#endif

           pcre_version());
 
   init_lookup_list();
           pcre_version());
 
   init_lookup_list();