From 8175f9aac7f010824e73df2cf5e5f86e75993aee Mon Sep 17 00:00:00 2001 From: Sorin Sbarnea Date: Thu, 23 Apr 2009 15:18:07 +0000 Subject: [PATCH] Added check for __MACTYPES__ in order to not redefine types defines on Carbon. --- lib/common/BasicTypes.h | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/lib/common/BasicTypes.h b/lib/common/BasicTypes.h index b9d8293e..0ae81c84 100644 --- a/lib/common/BasicTypes.h +++ b/lib/common/BasicTypes.h @@ -44,7 +44,7 @@ # endif #endif -// + // // verify existence of required types // @@ -67,14 +67,15 @@ // larger than indicated. // +// Added this because it doesn't compile on OS X 10.6 because they are already defined in Carbon +#if !defined(__MACTYPES__) typedef signed TYPE_OF_SIZE_1 SInt8; typedef signed TYPE_OF_SIZE_2 SInt16; typedef signed TYPE_OF_SIZE_4 SInt32; - typedef unsigned TYPE_OF_SIZE_1 UInt8; typedef unsigned TYPE_OF_SIZE_2 UInt16; typedef unsigned TYPE_OF_SIZE_4 UInt32; - +#endif // // clean up // @@ -84,3 +85,4 @@ typedef unsigned TYPE_OF_SIZE_4 UInt32; #undef TYPE_OF_SIZE_4 #endif + \ No newline at end of file