diff options
| author | Jeffrey Walton <noloader@gmail.com> | 2018-10-28 03:42:50 -0400 |
|---|---|---|
| committer | Jeffrey Walton <noloader@gmail.com> | 2018-10-28 03:42:50 -0400 |
| commit | e185cbd80335a7f1f9e69bb4c078f3369c047b9c (patch) | |
| tree | a2115c89becec88a2c7e22c0c2fe879b7fa67fae /config.h | |
| parent | a7615a8c7c59f5c11e784c8d3b39c9030b8929a1 (diff) | |
| download | cryptopp-git-e185cbd80335a7f1f9e69bb4c078f3369c047b9c.tar.gz | |
Revert "Sync CRYPTOPP_{BIG|LITTLE}_ENDIAN with Autotools"
This reverts commit 04306f86ac36. It broke GCC 4.8 on PowerPC.
Diffstat (limited to 'config.h')
| -rw-r--r-- | config.h | 10 |
1 files changed, 5 insertions, 5 deletions
@@ -9,22 +9,22 @@ // ***************** Important Settings ********************
// define this if running on a big-endian CPU
-#if !(CRYPTOPP_LITTLE_ENDIAN) && !(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__)))
+#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
-#if !(CRYPTOPP_BIG_ENDIAN) && !(CRYPTOPP_LITTLE_ENDIAN)
+#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 (CRYPTOPP_BIG_ENDIAN) && defined(__GNUC__) && defined(__BYTE_ORDER__) && (__BYTE_ORDER__ != __ORDER_BIG_ENDIAN__)
+#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__"
#endif
-#if (CRYPTOPP_LITTLE_ENDIAN) && defined(__GNUC__) && defined(__BYTE_ORDER__) && (__BYTE_ORDER__ != __ORDER_LITTLE_ENDIAN__)
+#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__"
#endif
@@ -606,7 +606,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 (CRYPTOPP_BIG_ENDIAN)
+#if defined(CRYPTOPP_BIG_ENDIAN)
# define CRYPTOPP_DISABLE_ASM 1
#endif
|