From: Henrik Nordstrom <henrik@henriknordstrom.net>
Date: Thu, 25 Feb 2010 20:47:39 +0000 (+0100)
Subject: Fix merge conflict error in rev 9138 Fix more gcc-ism in CBDATA_DEBUG
X-Git-Tag: SQUID_3_0_STABLE25~9
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=708484b0348d77ab4b3b3711e0f91849ba9e038f;p=thirdparty%2Fsquid.git

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 9d3c179209..07a952b1c7 100644
--- 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)