From 527dc9f666b894430d258ce49840e761d1ef28d8 Mon Sep 17 00:00:00 2001 From: Steve Robbins Date: Mon, 2 Sep 2019 22:07:58 -0500 Subject: [PATCH] xmpsdk: Unconditionally use to define known bit-width types. --- xmpsdk/include/XMP_Const.h | 39 ++++++++++---------------------------- 1 file changed, 10 insertions(+), 29 deletions(-) diff --git a/xmpsdk/include/XMP_Const.h b/xmpsdk/include/XMP_Const.h index 03161888..e84e18fd 100644 --- a/xmpsdk/include/XMP_Const.h +++ b/xmpsdk/include/XMP_Const.h @@ -11,11 +11,8 @@ #include "XMP_Environment.h" - #include - -#if XMP_MacBuild // ! No stdint.h on Windows and some UNIXes. - #include -#endif +#include +#include #if __cplusplus extern "C" { @@ -34,31 +31,15 @@ extern "C" { // case only the declarations of the XMP_... types needs to change, not all of the uses. These // types are used where fixed sizes are required in order to have a known ABI for a DLL build. -#if XMP_MacBuild +typedef int8_t XMP_Int8; +typedef int16_t XMP_Int16; +typedef int32_t XMP_Int32; +typedef int64_t XMP_Int64; - typedef int8_t XMP_Int8; - typedef int16_t XMP_Int16; - typedef int32_t XMP_Int32; - typedef int64_t XMP_Int64; - - typedef uint8_t XMP_Uns8; - typedef uint16_t XMP_Uns16; - typedef uint32_t XMP_Uns32; - typedef uint64_t XMP_Uns64; - -#else - - typedef signed char XMP_Int8; - typedef signed short XMP_Int16; - typedef signed long XMP_Int32; - typedef signed long long XMP_Int64; - - typedef unsigned char XMP_Uns8; - typedef unsigned short XMP_Uns16; - typedef unsigned long XMP_Uns32; - typedef unsigned long long XMP_Uns64; - -#endif +typedef uint8_t XMP_Uns8; +typedef uint16_t XMP_Uns16; +typedef uint32_t XMP_Uns32; +typedef uint64_t XMP_Uns64; typedef XMP_Uns8 XMP_Bool;