Author: Francesco Chemolli <kinkie@squid-cache.org>

Fix more gcc-ism in CBDATA_DEBUG

diff --git a/src/cbdata.h b/src/cbdata.h
index ec5506004b70b5bb6b7503fa78d73d5ffc6fd525..9d3c17920918293c88fa6282a8e387df1499904a 100644 (file)
--- a/src/cbdata.h
+++ b/src/cbdata.h
@@ -73,6 +73,7 @@ extern cbdata_type cbdataInternalAddType(cbdata_type type, const char *label, in
 #define cbdataInternalUnlock(a)                cbdataInternalUnlockDbg(a,__FILE__,__LINE__)
 #define cbdataReferenceValidDone(var, ptr) cbdataInternalReferenceDoneValidDbg((void **)&(var), (ptr), __FILE__,__LINE__)
 #define CBDATA_CLASS2(type)    \
+       private: \
        static cbdata_type CBDATA_##type; \
        public: \
                void *operator new(size_t size) { \
@@ -83,8 +84,8 @@ extern cbdata_type cbdataInternalAddType(cbdata_type type, const char *label, in
                void operator delete (void *address) { \
                  if (address) cbdataInternalFreeDbg(address,__FILE__,__LINE__); \
                } \
-       private:
 #else
+#else /* CBDATA_DEBUG */
 #define cbdataAlloc(type) ((type *)cbdataInternalAlloc(CBDATA_##type))
 #define cbdataFree(var)                do {if (var) {cbdataInternalFree(var); var = NULL;}} while(0)
 #define cbdataReferenceValidDone(var, ptr) cbdataInternalReferenceDoneValid((void **)&(var), (ptr))