------------------------------------------------------------
revno: 12273
revision-id: squid3@treenet.co.nz-20120810080943-5i6os9hpcjv2ifea
parent: kinkie@squid-cache.org-20120810065649-asftqg1oyypm20z1
committer: Amos Jeffries <squid3@treenet.co.nz>
branch nick: trunk
timestamp: Fri 2012-08-10 02:09:43 -0600
message:
  allow for _SQUID_EXTERNNEW_ predefine
------------------------------------------------------------
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: squid3@treenet.co.nz-20120810080943-5i6os9hpcjv2ifea
# target_branch: http://bzr.squid-cache.org/bzr/squid3/trunk/
# testament_sha1: cc601af2d86d1c635d0199de0fe1466c99d19bc0
# timestamp: 2012-08-10 08:52:02 +0000
# source_branch: http://bzr.squid-cache.org/bzr/squid3/trunk/
# base_revision_id: kinkie@squid-cache.org-20120810065649-\
#   asftqg1oyypm20z1
# 
# Begin patch
=== modified file 'compat/os/macosx.h'
--- compat/os/macosx.h	2012-08-10 01:12:48 +0000
+++ compat/os/macosx.h	2012-08-10 08:09:43 +0000
@@ -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