Author: metze Date: 2006-09-19 03:51:45 +0000 (Tue, 19 Sep 2006) New Revision: 18675
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=18675 Log: merge from samba3: we need to define the macros the indicate we have bool even if we have not defining bool ourself metze Modified: branches/SAMBA_4_0/source/lib/replace/replace.h Changeset: Modified: branches/SAMBA_4_0/source/lib/replace/replace.h =================================================================== --- branches/SAMBA_4_0/source/lib/replace/replace.h 2006-09-19 03:48:31 UTC (rev 18674) +++ branches/SAMBA_4_0/source/lib/replace/replace.h 2006-09-19 03:51:45 UTC (rev 18675) @@ -324,11 +324,27 @@ #ifdef HAVE__Bool #define bool _Bool #else -#define __bool_true_false_are_defined typedef int bool; #endif #endif +/* + * to prevent <rpcsvc/yp_prot.h> from doing a redefine of 'bool' + * + * IRIX, HPUX, MacOS 10 and Solaris need BOOL_DEFINED + * Tru64 needs _BOOL_EXISTS + */ +#ifndef BOOL_DEFINED +#define BOOL_DEFINED +#endif +#ifndef _BOOL_EXISTS +#define _BOOL_EXISTS +#endif + +#ifndef __bool_true_false_are_defined +#define __bool_true_false_are_defined +#endif + #ifndef true #define true (1) #endif