From: Amos Jeffries <squid3@treenet.co.nz>
Date: Sat, 27 Aug 2011 07:45:03 +0000 (-0600)
Subject: Fix NIS helper build on FreeBSD
X-Git-Tag: SQUID_3_1_15~13
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=674334273329c8dbb9d1749bd8e18a8bbaad5459;p=thirdparty%2Fsquid.git

Fix NIS helper build on FreeBSD

Fails on clang++ and other strict compilers due to missing __cplusplus
checks in FreeBSD system headers and yp_prot.h typedefs bool unless
BOOL_DEFINED is defined.
---

diff --git a/helpers/basic_auth/YP/nis_support.c b/helpers/basic_auth/YP/nis_support.c
index 34137d18c2..026e3ab5b0 100644
--- a/helpers/basic_auth/YP/nis_support.c
+++ b/helpers/basic_auth/YP/nis_support.c
@@ -8,6 +8,12 @@
 #include <syslog.h>
 #include <sys/types.h>
 #include <rpc/rpc.h>
+
+#if _SQUID_FREEBSD_  && !defined(BOOL_DEFINED)
+// BUG: FreeBSD rpcsvc/yp_* headers try to redefine bool unless we match their non-standard hack.
+#define BOOL_DEFINED
+#endif
+
 #include <rpcsvc/ypclnt.h>
 #include <rpcsvc/yp_prot.h>