Fix merge conflict error in rev 9138 Fix more gcc-ism in CBDATA_DEBUG

diff --git a/src/cbdata.h b/src/cbdata.h
index 9d3c17920918293c88fa6282a8e387df1499904a..07a952b1c7e80a4feca99565009664856353a897 100644 (file)
--- a/src/cbdata.h
+++ b/src/cbdata.h
@@ -83,8 +83,7 @@ extern cbdata_type cbdataInternalAddType(cbdata_type type, const char *label, in
                } \
                void operator delete (void *address) { \
                  if (address) cbdataInternalFreeDbg(address,__FILE__,__LINE__); \
-               } \
-#else
+               }
 #else /* CBDATA_DEBUG */
 #define cbdataAlloc(type) ((type *)cbdataInternalAlloc(CBDATA_##type))
 #define cbdataFree(var)                do {if (var) {cbdataInternalFree(var); var = NULL;}} while(0)