diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2004-12-15 14:05:07 +0000 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2004-12-15 14:05:07 +0000 |
| commit | 95b84adb9b4b3270eb44d415be3d6bce00366729 (patch) | |
| tree | fe63c6e882ca41f3091be6268097ad541ea461d3 | |
| parent | b34d161703a65776b56eeacce088545abb57281b (diff) | |
precaution to prevent double typedefs of the bool
| -rw-r--r-- | lib/setup.h | 2 | ||||
| -rw-r--r-- | src/setup.h | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/lib/setup.h b/lib/setup.h index 8530f0224..b893417a4 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 5c9b19cfa..288a01220 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 |