From: Francesco Chemolli <kinkie@squid-cache.org>
Date: Fri, 13 Nov 2009 16:12:31 +0000 (+0100)
Subject: Portability fix: define non-macro variant of debug.
X-Git-Tag: SQUID_3_2_0_1~577
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2a9c817f7b9799c8f11e4e0b41ffe4e359d84d7e;p=thirdparty%2Fsquid.git

Portability fix: define non-macro variant of debug.
---

diff --git a/compat/debug.cc b/compat/debug.cc
index 9d307d571a..3a510988ea 100644
--- a/compat/debug.cc
+++ b/compat/debug.cc
@@ -1,4 +1,20 @@
-#include "config.h"
+#include "compat/debug.h"
 
 /* default off */
 int debug_enabled = 0;
+
+#ifndef __GNUC__
+/* under gcc a macro define in compat/debug.h is used instead */
+
+void
+debug(char *format,...)
+{
+    if (!debug_enabled)
+        return;
+    va_list args;
+    va_start (args,format);
+    vfprintf(stderr,format,args);
+    va_end(args);
+}
+
+#endif /* __GNUC__ */
diff --git a/compat/debug.h b/compat/debug.h
index 01367403ad..b03d6361de 100644
--- a/compat/debug.h
+++ b/compat/debug.h
@@ -20,10 +20,11 @@
 
 /* Debugging stuff */
 
+SQUIDCEXTERN int debug_enabled;
+
 /* the macro overload style is really a gcc-ism */
 #ifdef __GNUC__
 
-SQUIDCEXTERN int debug_enabled;
 
 #define debug(X...) \
                      if (debug_enabled) { \
@@ -33,12 +34,8 @@ SQUIDCEXTERN int debug_enabled;
 
 #else /* __GNUC__ */
 
-/* TODO: non-GCC compilers can't do the above macro define yet. */
-inline void
-debug(char *format,...)
-{
-    ; // nothing to do.
-}
+/* non-GCC compilers can't do the above macro define yet. */
+void debug(char *format,...);
 #endif