From: Amos Jeffries <squid3@treenet.co.nz>
Date: Fri, 3 Dec 2010 04:57:33 +0000 (+1300)
Subject: Fix malloc_statistics C++ linkages
X-Git-Tag: take1~46
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0210ab2339d7bf3857c8120e14cd66e68a82a073;p=thirdparty%2Fsquid.git

Fix malloc_statistics C++ linkages
---

diff --git a/compat/xalloc.h b/compat/xalloc.h
index fd92601459..1d86f404e2 100644
--- a/compat/xalloc.h
+++ b/compat/xalloc.h
@@ -62,13 +62,12 @@ extern "C" {
      */
 #define safe_free(x)    while (x) { xxfree(x); (x) = NULL; }
 
-
-#if XMALLOC_STATISTICS
-    void malloc_statistics(void (*func) (int, int, int, void *), void *data);
-#endif
-
 #ifdef __cplusplus
 }
 #endif
 
+#if XMALLOC_STATISTICS
+extern void malloc_statistics(void (*func) (int, int, int, void *), void *data);
+#endif
+
 #endif /* _SQUID_COMPAT_XALLOC_H */
diff --git a/include/util.h b/include/util.h
index f3d1c40c5c..4f4e426a75 100644
--- a/include/util.h
+++ b/include/util.h
@@ -66,10 +66,6 @@ SQUIDCEXTERN void Tolower(char *);
 #include "SquidNew.h"
 #endif
 
-#if 0 && XMALLOC_STATISTICS
-SQUIDCEXTERN void malloc_statistics(void (*)(int, int, int, void *), void *);
-#endif
-
 #if XMALLOC_TRACE
 #define xmalloc(size) (xmalloc_func="xmalloc",xmalloc_line=__LINE__,xmalloc_file=__FILE__,xmalloc(size))
 #define xfree(ptr) (xmalloc_func="xfree",xmalloc_line=__LINE__,xmalloc_file=__FILE__,xfree(ptr))