fixed minor compilation error on leopard

This commit is contained in:
gecko_reverse 2008-02-26 08:27:46 +00:00
parent 74b5333368
commit f864ba96f3
1 changed files with 6 additions and 1 deletions

View File

@ -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