From: Hallvard Furuseth <hallvard@openldap.org>
Date: Thu, 6 Dec 2007 17:08:10 +0000 (+0000)
Subject: Restore pre-C99 preprocessor support (since rev 1.165)
X-Git-Tag: OPENLDAP_REL_ENG_2_4_9~20^2~342
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=e50cb475427cb9ee4eefff2f26c2173e45e7dfc8;p=openldap

Restore pre-C99 preprocessor support (since rev 1.165)
---

diff --git a/servers/slapd/back-bdb/back-bdb.h b/servers/slapd/back-bdb/back-bdb.h
index 14ca178f68..e3a9a2caad 100644
--- a/servers/slapd/back-bdb/back-bdb.h
+++ b/servers/slapd/back-bdb/back-bdb.h
@@ -327,9 +327,12 @@ extern int __db_logmsg(const DB_ENV *env, DB_TXN *txn, const char *op, u_int32_t
 #define	BDB_LOG_PRINTF(env,txn,fmt,...)	__db_logmsg((env),(txn),"DIAGNOSTIC",0,(fmt),__VA_ARGS__)
 #endif
 
-#else /* !BDB_LOG_DEBUG */
-
+/* !BDB_LOG_DEBUG */
+#elif (defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L) || \
+	(defined(__GNUC__) && __GNUC__ >= 3 && !defined(__STRICT_ANSI__))
 #define BDB_LOG_PRINTF(a,b,c,...)
+#else
+#define BDB_LOG_PRINTF (void)	/* will evaluate and discard the arguments */
 
 #endif /* BDB_LOG_DEBUG */