From: <ad...@oa...> - 2009-06-02 21:39:27
|
CVS Commit by aduck Today is: Tue Jun 2 22:32:58 BST 2009 ********************************************************************************* cvsroot/AAF/sss-impl/ssrw_c/Types.h,v From Revision 1.6 to 1.7 ********************************************************************************* Log Comments: 64bit port to darwin64 target ============================================================================= Differences: --- Types.h 21 Dec 2004 09:57:30 -0000 1.6 +++ Types.h 2 Jun 2009 21:32:58 -0000 1.7 @@ -9,12 +9,12 @@ * * (c) Schema Software Inc., 2001-2003 * ************************************************************************* -$Revision: 1.6 $ -$Date: 2004/12/21 09:57:30 $ +$Revision: 1.7 $ +$Date: 2009/06/02 21:32:58 $ */ #ifndef __TYPES_H__ #define __TYPES_H__ #ifdef UINT8 @@ -60,44 +60,65 @@ #ifdef FLT4 #undef FLT4 #endif /* FLT4 */ #ifdef x86_64 - typedef unsigned long UINT8; typedef unsigned int UINT4; typedef unsigned short UINT2; typedef unsigned char BYTE; #else /* Ix86_64 */ -#ifdef _MSC_VER /* If this is Visual C++ */ -typedef unsigned __int64 UINT8; -#else /* _MSC_VER */ -typedef unsigned long long UINT8; +# ifdef _MSC_VER /* If this is Visual C++ */ + typedef unsigned __int64 UINT8; +# else /* _MSC_VER */ +// AutomaticDuck - emy +# ifdef __LP64__ + typedef unsigned long UINT8; + // macosx for 64bit wants long as 64 and int as 32 +# else + typedef unsigned long long UINT8; +# endif #endif /* _MSC_VER */ -typedef unsigned long UINT4; -typedef unsigned short UINT2; -typedef unsigned char BYTE; +# ifdef __LP64__ + typedef unsigned int UINT4 ; +# else + typedef unsigned long UINT4; +# endif +// end AutomaticDuck emy + typedef unsigned short UINT2; + typedef unsigned char BYTE; #endif /* Ix86_64 */ - #ifdef x86_64 typedef long SINT8; typedef int SINT4; typedef short SINT2; #else /* Ix86_64 */ #ifdef _MSC_VER /* If this is Visual C++ */ -typedef signed __int64 SINT8; + typedef signed __int64 SINT8; #else /* _MSC_VER */ -typedef signed long long SINT8; +# ifdef __LP64__ + // AutomaticDuck emy - this was wrong! should be signed long for __LP64__ + typedef signed long SINT8; +# else + typedef signed long long SINT8; +# endif #endif /* _MSC_VER */ -typedef signed long SINT4; + +// AutomaticDuck emy +#ifdef __LP64__ + typedef signed int SINT4; +#else + typedef signed long SINT4; +#endif + typedef signed short SINT2; #endif /* Ix86_64 */ |