[patch] fix NIS helper on FreeBSD with strict compilers

From: Pawel Worach <pawel.worach_at_gmail.com>
Date: Sat, 13 Aug 2011 09:33:41 +0200

Hi,

The NIS helper fails to build using clang with:
In file included from ../../../../helpers/basic_auth/NIS/nis_support.cc:12:
/usr/include/rpcsvc/yp_prot.h:71:15: error: redeclaration of C++ built-in type
      'bool'
typedef u_int bool;
              ^
1 error generated.

This is due to missing __cplusplus checks in FreeBSD system headers and yp_prot.h typedefs bool unless BOOL_DEFINED is defined.
Fix:

=== modified file 'helpers/basic_auth/NIS/nis_support.cc'
--- helpers/basic_auth/NIS/nis_support.cc 2010-11-20 11:31:38 +0000
+++ helpers/basic_auth/NIS/nis_support.cc 2011-08-13 07:27:22 +0000
@@ -8,6 +8,11 @@
 #include <syslog.h>
 #include <sys/types.h>
 #include <rpc/rpc.h>
+
+#if _SQUID_FREEBSD_ && !defined(BOOL_DEFINED)
+#define BOOL_DEFINED
+#endif
+
 #include <rpcsvc/ypclnt.h>
 #include <rpcsvc/yp_prot.h>
 

-- 
Pawel
Received on Sat Aug 13 2011 - 07:33:55 MDT

This archive was generated by hypermail 2.2.0 : Sun Aug 14 2011 - 12:00:06 MDT