From 95b84adb9b4b3270eb44d415be3d6bce00366729 Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Wed, 15 Dec 2004 14:05:07 +0000 Subject: [PATCH] precaution to prevent double typedefs of the bool --- lib/setup.h | 2 +- src/setup.h | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/lib/setup.h b/lib/setup.h index 8530f02..b893417 100644 --- a/lib/setup.h +++ b/lib/setup.h @@ -66,7 +66,7 @@ #define FALSE 0 #endif -#if !defined(__cplusplus) && !defined(__BEOS__) +#if !defined(__cplusplus) && !defined(__BEOS__) && !defined(typedef_bool) typedef unsigned char bool; #define typedef_bool #endif diff --git a/src/setup.h b/src/setup.h index 5c9b19c..288a012 100644 --- a/src/setup.h +++ b/src/setup.h @@ -69,10 +69,9 @@ #define FALSE 0 #endif -#ifndef __cplusplus -#ifndef typedef_bool +#if !defined(__cplusplus) && !defined(__BEOS__) && !defined(typedef_bool) typedef char bool; -#endif +#define typedef_bool #endif #ifndef OS -- 2.7.4