Another valgrind.h portability fix.

C89 compilers do not support variable argument macros.
Our copy of valgrind.h now differs from upstream.

Reported-by: Heiko Schlichting <heiko.schlichting@fu-berlin.de>

diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog
index 317f78ca9106e270052dfa9c7072b03538edb919..853f3a57321881ccb6b3e827616532f4c8d2aea5 100644 (file)
--- a/doc/doc-txt/ChangeLog
+++ b/doc/doc-txt/ChangeLog
@@ -83,6 +83,9 @@ PP/16 Make DISABLE_DKIM build knob functional.
 NM/06 Bugzilla 968: child_open_uid: restore default SIGPIPE handler
       Patch by Simon Arlott
 
 NM/06 Bugzilla 968: child_open_uid: restore default SIGPIPE handler
       Patch by Simon Arlott
 

+TF/03 Fix valgrind.h portability to C89 compilers that do not support
+      variable argument macros. Our copy now differs from upstream.
+

 
 Exim version 4.74
 -----------------
 
 Exim version 4.74
 -----------------

diff --git a/src/src/valgrind.h b/src/src/valgrind.h
index 0bae0aa130eec3cf426bdff3bdd3880c7b308158..4d41690ab96fd3c9ae512e57e8ac350eac306452 100644 (file)
--- a/src/src/valgrind.h
+++ b/src/src/valgrind.h
@@ -4417,8 +4417,13 @@ vg_VALGRIND_DO_CLIENT_REQUEST_EXPR(uintptr_t _zzq_default,
 
 #if defined(NVALGRIND)
 
 
 #if defined(NVALGRIND)
 

-#  define VALGRIND_PRINTF(...)
-#  define VALGRIND_PRINTF_BACKTRACE(...)
+/* In Exim the following two lines have been changed from the original
+   version for portability to C89 compilers that don't support variable
+   argument macros. We don't use these macros so it doesn't matter much what
+   we do with them, but the following will work OK in most situations though
+   it may cause complaints about expressions without side-effects. */
+#  define VALGRIND_PRINTF (void)
+#  define VALGRIND_PRINTF_BACKTRACE (void)

 
 #else /* NVALGRIND */
 
 
 #else /* NVALGRIND */