From f864ba96f37f28851232a9b14c4706d62c75e256 Mon Sep 17 00:00:00 2001 From: gecko_reverse Date: Tue, 26 Feb 2008 08:27:46 +0000 Subject: [PATCH] fixed minor compilation error on leopard --- desmume/src/types.h | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/desmume/src/types.h b/desmume/src/types.h index 3f61d0311..a882555ba 100644 --- a/desmume/src/types.h +++ b/desmume/src/types.h @@ -72,7 +72,12 @@ typedef signed long long s64; typedef u8 uint8; typedef u16 uint16; + +#ifndef OBJ_C typedef u32 uint32; +#else +#define uint32 u32 //uint32 is defined in Leopard somewhere, avoid conflicts +#endif /*---------- GPU3D fixed-points types -----------*/ @@ -108,7 +113,7 @@ typedef s16 v10; #ifndef OBJ_C typedef int BOOL; #else -//apple defines BOOL so this is to avoid conflicts +//apple also defines BOOL typedef int desmume_BOOL; #define BOOL desmume_BOOL #endif