------------------------------------------------------------
revno: 12269
revision-id: squid3@treenet.co.nz-20120810011248-eu3dm35i4xh53xnj
parent: squid3@treenet.co.nz-20120810003814-rwxz0gn1m1ozu0mb
committer: Amos Jeffries <squid3@treenet.co.nz>
branch nick: trunk
timestamp: Fri 2012-08-10 13:12:48 +1200
message:
  MacOS: warning: 'gnu_inline' attribute directive ignored
------------------------------------------------------------
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: squid3@treenet.co.nz-20120810011248-eu3dm35i4xh53xnj
# target_branch: http://bzr.squid-cache.org/bzr/squid3/trunk/
# testament_sha1: f3f54242e54173be7245bdc78c0c16a026bfd60f
# timestamp: 2012-08-10 01:52:13 +0000
# source_branch: http://bzr.squid-cache.org/bzr/squid3/trunk/
# base_revision_id: squid3@treenet.co.nz-20120810003814-\
#   rwxz0gn1m1ozu0mb
# 
# Begin patch
=== modified file 'compat/os/macosx.h'
--- compat/os/macosx.h	2012-05-29 12:20:02 +0000
+++ compat/os/macosx.h	2012-08-10 01:12:48 +0000
@@ -20,5 +20,10 @@
 
 #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)
+#define _SQUID_EXTERNNEW_ extern inline
+#endif
+
 #endif /* _SQUID_APPLE_ */
 #endif /* SQUID_OS_MACOSX_H */