diff options
Diffstat (limited to 'src/pal/inc/pal_mstypes.h')
| -rw-r--r-- | src/pal/inc/pal_mstypes.h | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/pal/inc/pal_mstypes.h b/src/pal/inc/pal_mstypes.h index df17767747..b9c3ac2e4a 100644 --- a/src/pal/inc/pal_mstypes.h +++ b/src/pal/inc/pal_mstypes.h @@ -56,12 +56,6 @@ extern "C" { #define CDECL __cdecl #endif -#ifndef PAL_STDCPP_COMPAT -#undef __fastcall -#define __fastcall __stdcall -#undef _fastcall -#define _fastcall __fastcall -#endif // PAL_STDCPP_COMPAT #else // !defined(__i386__) @@ -215,6 +209,9 @@ extern "C" { // Defined in gnu's types.h. For non PAL_IMPLEMENTATION system // includes are not included, so we need to define them. #ifndef PAL_IMPLEMENTATION + +// OS X already defines these types in 64 bit +#if !defined(_TARGET_MAC64) typedef __int64 int64_t; typedef unsigned __int64 uint64_t; typedef __int32 int32_t; @@ -223,6 +220,8 @@ typedef __int16 int16_t; typedef unsigned __int16 uint16_t; typedef __int8 int8_t; typedef unsigned __int8 uint8_t; +#endif + #endif // PAL_IMPLEMENTATION #ifndef _MSC_VER |