Added check for __MACTYPES__ in order to not redefine types defines on Carbon.
This commit is contained in:
parent
1ee6238aa1
commit
8175f9aac7
|
@ -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
|
||||
|
Loading…
Reference in New Issue