rayelliott
/
barrier
mirror of https://github.com/debauchee/barrier.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Added check for __MACTYPES__ in order to not redefine types defines on Carbon.

This commit is contained in:
Sorin Sbarnea 2009-04-23 15:18:07 +00:00
parent 1ee6238aa1
commit 8175f9aac7
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/common/BasicTypes.h
View File

@ -44,7 +44,7 @@
# endif # endif
#endif #endif
// //
// verify existence of required types // verify existence of required types
// //
@ -67,14 +67,15 @@
// larger than indicated. // 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_1 SInt8;
typedef signed TYPE_OF_SIZE_2 SInt16; typedef signed TYPE_OF_SIZE_2 SInt16;
typedef signed TYPE_OF_SIZE_4 SInt32; typedef signed TYPE_OF_SIZE_4 SInt32;
typedef unsigned TYPE_OF_SIZE_1 UInt8; typedef unsigned TYPE_OF_SIZE_1 UInt8;
typedef unsigned TYPE_OF_SIZE_2 UInt16; typedef unsigned TYPE_OF_SIZE_2 UInt16;
typedef unsigned TYPE_OF_SIZE_4 UInt32; typedef unsigned TYPE_OF_SIZE_4 UInt32;
#endif
// //
// clean up // clean up
// //
@ -84,3 +85,4 @@ typedef unsigned TYPE_OF_SIZE_4 UInt32;
#undef TYPE_OF_SIZE_4 #undef TYPE_OF_SIZE_4
#endif #endif