From 200ae4fa2a6580e3950f06922eab52330a03c0bb Mon Sep 17 00:00:00 2001 From: Thomas Beutlich <115483027+thbeu@users.noreply.github.com> Date: Tue, 6 Feb 2024 16:16:36 +0100 Subject: [PATCH] Move endian defines to shapefil_private.h (#99) --- shapefil.h | 23 ----------------------- shapefil_private.h | 23 +++++++++++++++++++++++ 2 files changed, 23 insertions(+), 23 deletions(-) diff --git a/shapefil.h b/shapefil.h index 83a77b2..87f9c39 100644 --- a/shapefil.h +++ b/shapefil.h @@ -22,29 +22,6 @@ #include "cpl_conv.h" #endif -#if !defined(SHP_BIG_ENDIAN) -#if defined(CPL_MSB) -#define SHP_BIG_ENDIAN 1 -#elif (defined(__GNUC__) && __GNUC__ >= 5) || \ - (defined(__GNUC__) && defined(__GNUC_MINOR__) && __GNUC__ == 4 && \ - __GNUC_MINOR__ >= 6) -#if __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__ -#define SHP_BIG_ENDIAN 1 -#endif -#elif defined(__GLIBC__) -#if __BYTE_ORDER == __BIG_ENDIAN -#define SHP_BIG_ENDIAN 1 -#endif -#elif defined(_BIG_ENDIAN) && !defined(_LITTLE_ENDIAN) -#define SHP_BIG_ENDIAN 1 -#elif defined(_LITTLE_ENDIAN) && !defined(_BIG_ENDIAN) -#elif defined(__sparc) || defined(__sparc__) || defined(_POWER) || \ - defined(__powerpc__) || defined(__ppc__) || defined(__hpux) || \ - defined(_MIPSEB) || defined(_POWER) || defined(__s390__) -#define SHP_BIG_ENDIAN 1 -#endif -#endif - #ifdef __cplusplus extern "C" { diff --git a/shapefil_private.h b/shapefil_private.h index f8bfbc1..86d11b5 100644 --- a/shapefil_private.h +++ b/shapefil_private.h @@ -28,6 +28,29 @@ #define SHPLIB_NULLPTR NULL #endif +#if !defined(SHP_BIG_ENDIAN) +#if defined(CPL_MSB) +#define SHP_BIG_ENDIAN 1 +#elif (defined(__GNUC__) && __GNUC__ >= 5) || \ + (defined(__GNUC__) && defined(__GNUC_MINOR__) && __GNUC__ == 4 && \ + __GNUC_MINOR__ >= 6) +#if __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__ +#define SHP_BIG_ENDIAN 1 +#endif +#elif defined(__GLIBC__) +#if __BYTE_ORDER == __BIG_ENDIAN +#define SHP_BIG_ENDIAN 1 +#endif +#elif defined(_BIG_ENDIAN) && !defined(_LITTLE_ENDIAN) +#define SHP_BIG_ENDIAN 1 +#elif defined(_LITTLE_ENDIAN) && !defined(_BIG_ENDIAN) +#elif defined(__sparc) || defined(__sparc__) || defined(_POWER) || \ + defined(__powerpc__) || defined(__ppc__) || defined(__hpux) || \ + defined(_MIPSEB) || defined(_POWER) || defined(__s390__) +#define SHP_BIG_ENDIAN 1 +#endif +#endif + #include "shapefil.h" #include #include