diff options
| author | Brad King <brad.king@kitware.com> | 2016-11-03 14:04:59 -0400 |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2016-11-10 08:29:37 -0500 |
| commit | d0ff3e701c63caab5a44c48ac70e3ab75af9ee88 (patch) | |
| tree | b444b1c2d19c000788974e1ae7ab1a56932a78e2 /Utilities | |
| parent | 465a85fb4615f4cfa20058c534bf3bfe71df1732 (diff) | |
| download | cmake-d0ff3e701c63caab5a44c48ac70e3ab75af9ee88.tar.gz | |
librhash: Port to KWIML for ABI and integer type information
Diffstat (limited to 'Utilities')
| -rw-r--r-- | Utilities/cmlibrhash/librhash/byte_order.h | 20 | ||||
| -rw-r--r-- | Utilities/cmlibrhash/librhash/ustd.h | 48 |
2 files changed, 28 insertions, 40 deletions
diff --git a/Utilities/cmlibrhash/librhash/byte_order.h b/Utilities/cmlibrhash/librhash/byte_order.h index f8330e1356..d34a020b86 100644 --- a/Utilities/cmlibrhash/librhash/byte_order.h +++ b/Utilities/cmlibrhash/librhash/byte_order.h @@ -4,10 +4,6 @@ #include "ustd.h" #include <stdlib.h> -#ifdef __GLIBC__ -# include <endian.h> -#endif - #ifdef __cplusplus extern "C" { #endif @@ -32,22 +28,12 @@ extern "C" { /* detect CPU endianness */ -#if (defined(__BYTE_ORDER) && defined(__LITTLE_ENDIAN) && \ - __BYTE_ORDER == __LITTLE_ENDIAN) || \ - defined(CPU_IA32) || defined(CPU_X64) || \ - defined(__ia64) || defined(__ia64__) || defined(__alpha__) || defined(_M_ALPHA) || \ - defined(vax) || defined(MIPSEL) || defined(_ARM_) || defined(__arm__) +#include <cm_kwiml.h> +#if KWIML_ABI_ENDIAN_ID == KWIML_ABI_ENDIAN_ID_LITTLE # define CPU_LITTLE_ENDIAN # define IS_BIG_ENDIAN 0 # define IS_LITTLE_ENDIAN 1 -#elif (defined(__BYTE_ORDER) && defined(__BIG_ENDIAN) && \ - __BYTE_ORDER == __BIG_ENDIAN) || \ - defined(__sparc) || defined(__sparc__) || defined(sparc) || \ - defined(_ARCH_PPC) || defined(_ARCH_PPC64) || defined(_POWER) || \ - defined(__POWERPC__) || defined(POWERPC) || defined(__powerpc) || \ - defined(__powerpc__) || defined(__powerpc64__) || defined(__ppc__) || \ - defined(__hpux) || defined(_MIPSEB) || defined(mc68000) || \ - defined(__s390__) || defined(__s390x__) || defined(sel) +#elif KWIML_ABI_ENDIAN_ID == KWIML_ABI_ENDIAN_ID_BIG # define CPU_BIG_ENDIAN # define IS_BIG_ENDIAN 1 # define IS_LITTLE_ENDIAN 0 diff --git a/Utilities/cmlibrhash/librhash/ustd.h b/Utilities/cmlibrhash/librhash/ustd.h index 5bd9aacb49..019b931931 100644 --- a/Utilities/cmlibrhash/librhash/ustd.h +++ b/Utilities/cmlibrhash/librhash/ustd.h @@ -9,29 +9,31 @@ # pragma warning(push,1) #endif -#if _MSC_VER >= 1300 +#include <cm_kwiml.h> -# define int64_t __int64 -# define int32_t __int32 -# define int16_t __int16 -# define int8_t __int8 -# define uint64_t unsigned __int64 -# define uint32_t unsigned __int32 -# define uint16_t unsigned __int16 -# define uint8_t unsigned __int8 - -/* disable warnings: The POSIX name for this item is deprecated. Use the ISO C++ conformant name. */ -#pragma warning(disable : 4996) - -#else /* _MSC_VER >= 1300 */ - -# include <stdint.h> -# include <unistd.h> - -#endif /* _MSC_VER >= 1300 */ - -#if _MSC_VER <= 1300 -# include <stdlib.h> /* size_t for vc6.0 */ -#endif /* _MSC_VER <= 1300 */ +#ifndef KWIML_INT_HAVE_INT64_T +# define int64_t KWIML_INT_int64_t +#endif +#ifndef KWIML_INT_HAVE_INT32_T +# define int32_t KWIML_INT_int32_t +#endif +#ifndef KWIML_INT_HAVE_INT16_T +# define int16_t KWIML_INT_int16_t +#endif +#ifndef KWIML_INT_HAVE_INT8_T +# define int8_t KWIML_INT_int8_t +#endif +#ifndef KWIML_INT_HAVE_UINT64_T +# define uint64_t KWIML_INT_uint64_t +#endif +#ifndef KWIML_INT_HAVE_UINT32_T +# define uint32_t KWIML_INT_uint32_t +#endif +#ifndef KWIML_INT_HAVE_UINT16_T +# define uint16_t KWIML_INT_uint16_t +#endif +#ifndef KWIML_INT_HAVE_UINT8_T +# define uint8_t KWIML_INT_uint8_t +#endif #endif /* LIBRHASH_USTD_H */ |