Re: [patch] fix NIS helper on FreeBSD with strict compilers

On 13/08/11 19:33, Pawel Worach wrote:
> 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>
>
>

Applied.

Amos

-- 
Please be using
   Current Stable Squid 2.7.STABLE9 or 3.1.14
   Beta testers wanted for 3.2.0.10