Merge pull request #77 from eProsima/bugfrix/endianness_macro

Set and check endianness with FASTCDR_IS_BIG_ENDIAN_TARGET
eProsima · Sep 1, 2020 · 721b99e · 721b99e
2 parents c5668b9 + 82a2a4e
commit 721b99e
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/cmake/common/check_configuration.cmake b/cmake/common/check_configuration.cmake
@@ -76,7 +76,7 @@ macro(check_endianness)
     # Test endianness
     include(TestBigEndian)
     test_big_endian(BIG_ENDIAN)
-    set(__BIG_ENDIAN__ ${BIG_ENDIAN})
+    set(FASTCDR_IS_BIG_ENDIAN_TARGET ${BIG_ENDIAN})
 endmacro()
 
 macro(check_msvc_arch)

diff --git a/configure.ac b/configure.ac
@@ -47,8 +47,8 @@ AS_IF([test $HAVE_CXX11 = 1],
 
 # Check endianess
 AC_C_BIGENDIAN(
-  AC_DEFINE(__BIG_ENDIAN__, 1, [machine is bigendian]),
-  AC_DEFINE(__BIG_ENDIAN__, 0, [machine is littleendian]),
+  AC_DEFINE(FASTCDR_IS_BIG_ENDIAN_TARGET, 1, [machine is bigendian]),
+  AC_DEFINE(FASTCDR_IS_BIG_ENDIAN_TARGET, 0, [machine is littleendian]),
   AC_MSG_ERROR(unknown endianess),
   AC_MSG_ERROR(universial endianess not supported)
 )

diff --git a/include/fastcdr/config.h.in b/include/fastcdr/config.h.in
@@ -42,8 +42,8 @@
 #endif
 
 // Endianness defines
-#ifndef __BIG_ENDIAN__
-#define __BIG_ENDIAN__ @__BIG_ENDIAN__@
+#ifndef FASTCDR_IS_BIG_ENDIAN_TARGET
+#define FASTCDR_IS_BIG_ENDIAN_TARGET @FASTCDR_IS_BIG_ENDIAN_TARGET@
 #endif
 
 #if defined(__ARM_ARCH) && __ARM_ARCH <= 7

diff --git a/src/cpp/Cdr.cpp b/src/cpp/Cdr.cpp
@@ -18,7 +18,7 @@
 using namespace eprosima::fastcdr;
 using namespace ::exception;
 
-#if __BIG_ENDIAN__
+#if FASTCDR_IS_BIG_ENDIAN_TARGET
 const Cdr::Endianness Cdr::DEFAULT_ENDIAN = BIG_ENDIANNESS;
 #else
 const Cdr::Endianness Cdr::DEFAULT_ENDIAN = LITTLE_ENDIANNESS;