From 07ae949c15d35f901036a10c75620cc0c7bc2de6 Mon Sep 17 00:00:00 2001 From: Daniel Black Date: Sat, 9 Sep 2023 08:20:45 +1000 Subject: [PATCH] MDEV-19511 Remove WORDS_BIGENDIAN - HAVE_BIGENDIAN replaced it Also note https://cmake.org/cmake/help/latest/module/TestBigEndian.html Discussion source, https://lists.launchpad.net/maria-developers/msg11819.html It was solved a while ago with HAVE_BIGENDIAN added to test, WORDS_BIGENDIAN wasn't cleaned up. --- cmake/WindowsCache.cmake | 3 +-- include/ma_global.h | 4 ++-- libmariadb/ma_dtoa.c | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/cmake/WindowsCache.cmake b/cmake/WindowsCache.cmake index 5323f78a..2d953c3e 100644 --- a/cmake/WindowsCache.cmake +++ b/cmake/WindowsCache.cmake @@ -300,8 +300,7 @@ IF(MSVC_VERSION GREATER 1310) SET(HAVE_VSNPRINTF 1 CACHE INTERNAL "") ENDIF() SET(HAVE_WEAK_SYMBOL CACHE INTERNAL "") -SET(HAVE_WORDS_BIGENDIAN TRUE CACHE INTERNAL "") -SET(WORDS_BIGENDIAN CACHE INTERNAL "") +SET(HAVE_BIGENDIAN CACHE INTERNAL "") SET(HAVE__S_IFIFO 1 CACHE INTERNAL "") SET(HAVE__S_IREAD 1 CACHE INTERNAL "") SET(HAVE__finite 1 CACHE INTERNAL "") diff --git a/include/ma_global.h b/include/ma_global.h index d5e3da9b..3cd3857b 100644 --- a/include/ma_global.h +++ b/include/ma_global.h @@ -961,7 +961,7 @@ do { doubleget_union _tmp; \ #define float8get(V,M) doubleget((V),(M)) #define float8store(V,M) doublestore((V),(M)) -#endif /* WORDS_BIGENDIAN */ +#endif /* HAVE_BIGENDIAN */ #endif /* __i386__ OR _WIN32 */ @@ -1031,7 +1031,7 @@ do { doubleget_union _tmp; \ #define longlongget(V,M) memcpy(&V, (M), sizeof(ulonglong)) #define longlongstore(T,V) memcpy((T), &V, sizeof(ulonglong)) -#endif /* WORDS_BIGENDIAN */ +#endif /* HAVE_BIGENDIAN */ #ifndef THREAD #define thread_safe_increment(V,L) ((V)++) diff --git a/libmariadb/ma_dtoa.c b/libmariadb/ma_dtoa.c index 8fdff6b8..fcdcee16 100644 --- a/libmariadb/ma_dtoa.c +++ b/libmariadb/ma_dtoa.c @@ -512,7 +512,7 @@ typedef uint64 ULLong; typedef union { double d; ULong L[2]; } U; -#if defined(HAVE_BIGENDIAN) || defined(WORDS_BIGENDIAN) || \ +#if defined(HAVE_BIGENDIAN) || \ (defined(__FLOAT_WORD_ORDER) && (__FLOAT_WORD_ORDER == __BIG_ENDIAN)) #define word0(x) ((x)->L[0]) #define word1(x) ((x)->L[1])