From: Pawel Worach <pawel.worach@gmail.com>
Date: Sun, 14 Aug 2011 12:42:59 +0000 (+1200)
Subject: Fix NIS helper build on FreeBSD
X-Git-Tag: take08~43^2~26
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a8f7fbed072f8a23e26aa9fdfdc0028f815b74fa;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/NIS/nis_support.cc b/helpers/basic_auth/NIS/nis_support.cc
index 9f33d83a5e..d6558bafda 100644
--- a/helpers/basic_auth/NIS/nis_support.cc
+++ b/helpers/basic_auth/NIS/nis_support.cc
@@ -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>