From 2d257370af62bbb5a9be1d325fc6936cb7444573 Mon Sep 17 00:00:00 2001 From: Bryce Denney Date: Wed, 26 Sep 2001 17:30:15 +0000 Subject: [PATCH] - resolve conflicts in Boolean type for MacOS X --- bochs/config.h.in | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/bochs/config.h.in b/bochs/config.h.in index 6eaff398e..ba52aaa56 100644 --- a/bochs/config.h.in +++ b/bochs/config.h.in @@ -426,7 +426,11 @@ # error "could not define bx_ptr_equiv_t to size of int*" #endif -#if BX_WITH_MACOS == 0 +#if BX_WITH_CARBON +typedef unsigned char Boolean; +#elif BX_WITH_MACOS +// don't define Boolean at all +#else typedef unsigned int Boolean; #endif