Sync CRYPTOPP_{BIG|LITTLE}_ENDIAN with Autotools

Autotools sets up its config.h file with the '#define XXX 0' or '#define XXX 1' pattern. This check-in makes the sources Autotools aware. We need to verify CMake does the same

1 files changed, 7 insertions, 6 deletions

diff --git a/config.h b/config.h
index 75bbdc72..65131315 100644
--- a/config.h
+++ b/config.h
@@ -9,23 +9,24 @@
 // ***************** Important Settings ********************

 

 // define this if running on a big-endian CPU

+// big endian will be assumed if CRYPTOPP_LITTLE_ENDIAN is not non-0

 #if !defined(CRYPTOPP_LITTLE_ENDIAN) && !defined(CRYPTOPP_BIG_ENDIAN) && (defined(__BIG_ENDIAN__) || (defined(__s390__) || defined(__s390x__) || defined(__zarch__)) || (defined(__m68k__) || defined(__MC68K__)) || defined(__sparc) || defined(__sparc__) || defined(__hppa__) || defined(__MIPSEB__) || defined(__ARMEB__) || (defined(__MWERKS__) && !defined(__INTEL__)))

 #	define CRYPTOPP_BIG_ENDIAN 1

 #endif

 

 // define this if running on a little-endian CPU

-// big endian will be assumed if CRYPTOPP_LITTLE_ENDIAN is not defined

+// big endian will be assumed if CRYPTOPP_LITTLE_ENDIAN is not non-0

 #if !defined(CRYPTOPP_BIG_ENDIAN) && !defined(CRYPTOPP_LITTLE_ENDIAN)

 #	define CRYPTOPP_LITTLE_ENDIAN 1

 #endif

 

 // Sanity checks. Some processors have more than big, little and bi-endian modes. PDP mode, where order results in "4312", should

 // raise red flags immediately. Additionally, mis-classified machines, like (previosuly) S/390, should raise red flags immediately.

-#if defined(CRYPTOPP_BIG_ENDIAN) && defined(__GNUC__) && defined(__BYTE_ORDER__) && (__BYTE_ORDER__ != __ORDER_BIG_ENDIAN__)

-# error "CRYPTOPP_BIG_ENDIAN is set, but __BYTE_ORDER__ is not __ORDER_BIG_ENDIAN__"

+#if (CRYPTOPP_BIG_ENDIAN) && defined(__GNUC__) && defined(__BYTE_ORDER__) && (__BYTE_ORDER__ != __ORDER_BIG_ENDIAN__)

+# error "(CRYPTOPP_BIG_ENDIAN) is set, but __BYTE_ORDER__ is not __ORDER_BIG_ENDIAN__"

 #endif

-#if defined(CRYPTOPP_LITTLE_ENDIAN) && defined(__GNUC__) && defined(__BYTE_ORDER__) && (__BYTE_ORDER__ != __ORDER_LITTLE_ENDIAN__)

-# error "CRYPTOPP_LITTLE_ENDIAN is set, but __BYTE_ORDER__ is not __ORDER_LITTLE_ENDIAN__"

+#if (CRYPTOPP_LITTLE_ENDIAN) && defined(__GNUC__) && defined(__BYTE_ORDER__) && (__BYTE_ORDER__ != __ORDER_LITTLE_ENDIAN__)

+# error "(CRYPTOPP_LITTLE_ENDIAN) is set, but __BYTE_ORDER__ is not __ORDER_LITTLE_ENDIAN__"

 #endif

 

 // Define this if you want to disable all OS-dependent features,

@@ -606,7 +607,7 @@ NAMESPACE_END
 

 // We don't have an ARM big endian test rig. Disable

 // ARM-BE ASM and instrinsics until we can test it.

-#if defined(CRYPTOPP_BIG_ENDIAN)

+#if (CRYPTOPP_BIG_ENDIAN)

 # define CRYPTOPP_DISABLE_ASM 1

 #endif