Rename BIG_ENDIAN to IS_BIG_ENDIAN

The BIG_ENDIAN macro is a system level macro that is always defined in C++
kimwalisch · Mar 14, 2018 · 20972c3 · 20972c3
1 parent ed9a1aa
commit 20972c3
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -94,10 +94,10 @@ check_cxx_source_runs("
         bool is_big_endian = (x.c[sizeof(long) - 1] == 1);
         return is_big_endian ? 0 : 1;
     }"
-  big_endian)
+    big_endian)
 
 if(big_endian)
-    set_source_files_properties(src/Sieve.cpp PROPERTIES COMPILE_DEFINITIONS BIG_ENDIAN)
+    set_source_files_properties(src/Sieve.cpp PROPERTIES COMPILE_DEFINITIONS IS_BIG_ENDIAN)
 endif()
 
 # Check for MPI (Message Passing Interface) ##########################

diff --git a/include/SieveEndianness.hpp b/include/SieveEndianness.hpp
@@ -19,10 +19,14 @@
 
 namespace {
 
-#if defined(BIG_ENDIAN) || \
-   (defined(__BYTE_ORDER__) && \
-    defined(__ORDER_BIG_ENDIAN__) && \
-    __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__)
+#if defined(__BYTE_ORDER__) && defined(__ORDER_BIG_ENDIAN__)
+  #undef IS_BIG_ENDIAN
+  #if __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
+    #define IS_BIG_ENDIAN
+  #endif
+#endif
+
+#if defined(IS_BIG_ENDIAN)
 
 /// The values of the big-endian lookup tables have been computed by
 /// converting the values of the little-endian lookup tables to