From: Amos Jeffries <squid3@treenet.co.nz>
Date: Fri, 10 Aug 2012 08:09:43 +0000 (-0600)
Subject: allow for _SQUID_EXTERNNEW_ predefine
X-Git-Tag: sourceformat-review-1~119
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=033d3d9475980f990a464a7928de082cd3438135;p=thirdparty%2Fsquid.git

allow for _SQUID_EXTERNNEW_ predefine
---

diff --git a/compat/os/macosx.h b/compat/os/macosx.h
index 049dafdac6..a98e441ba2 100644
--- a/compat/os/macosx.h
+++ b/compat/os/macosx.h
@@ -21,7 +21,7 @@
 #include "compat/cmsg.h"
 
 // MacOS GCC 4.0.1 and 4.2.1 supply __GNUC_GNU_INLINE__ but do not actually define  __attribute__((gnu_inline))
-#if defined(__cplusplus)
+#if defined(__cplusplus) && !defined(_SQUID_EXTERNNEW_)
 #define _SQUID_EXTERNNEW_ extern inline
 #endif