From: Francesco Chemolli <kinkie@squid-cache.org>
Date: Sun, 12 Jan 2014 02:12:13 +0000 (-0700)
Subject: Bug 4002: clang 3.4 unable to compile
X-Git-Tag: SQUID_3_4_3~14
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=40a08c3552d5533c52a414a98f6aaf241368d86e;p=thirdparty%2Fsquid.git

Bug 4002: clang 3.4 unable to compile

part 2: fix new/delete operator overloading by not defining on clang
---

diff --git a/include/SquidNew.h b/include/SquidNew.h
index a308097524..0321a8819a 100644
--- a/include/SquidNew.h
+++ b/include/SquidNew.h
@@ -31,7 +31,7 @@
 #ifndef SQUID_NEW_H
 #define SQUID_NEW_H
 
-#ifndef __SUNPRO_CC
+#if !defined(__SUNPRO_CC) && !defined(__clang__)
 /* Any code using libstdc++ must have externally resolvable overloads
  * for void * operator new - which means in the .o for the binary,
  * or in a shared library. static libs don't propogate the symbol
@@ -57,6 +57,6 @@ _SQUID_EXTERNNEW_ void operator delete[] (void *address) throw()
     xfree(address);
 }
 
-#endif /* __SUNPRO_CC */
+#endif /* !__SUNPRO_CC && !__clang__*/
 
 #endif /* SQUID_NEW_H */