From: Victor Stinner <vstinner@python.org>
Date: Mon, 7 Feb 2022 15:22:24 +0000 (+0100)
Subject: bpo-46670: Fix #ifdef in sha3module.c (GH-31180)
X-Git-Tag: v3.11.0a6~283
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f20ca766fe404a20daea29230f161a0eb71bb489;p=thirdparty%2FPython%2Fcpython.git

bpo-46670: Fix #ifdef in sha3module.c (GH-31180)

* Test if HAVE_ALIGNED_REQUIRED is defined, not its value.
* Define explicitly NOT_PYTHON macro to 0.

Fix "gcc -Wundef" warnings.
---

diff --git a/Modules/_sha3/sha3module.c b/Modules/_sha3/sha3module.c
index bfa96616df0c..bffd177c0e75 100644
--- a/Modules/_sha3/sha3module.c
+++ b/Modules/_sha3/sha3module.c
@@ -57,6 +57,8 @@
   typedef uint64_t UINT64;
   typedef unsigned char UINT8;
 #endif
+// kcp/KeccakP-1600-opt64.c doesn't need to define UINT8
+#define NOT_PYTHON 0
 
 /* replacement for brg_endian.h */
 #define IS_LITTLE_ENDIAN 1234
@@ -69,7 +71,7 @@
 #endif
 
 /* Prevent bus errors on platforms requiring aligned accesses such ARM. */
-#if HAVE_ALIGNED_REQUIRED && !defined(NO_MISALIGNED_ACCESSES)
+#if defined(HAVE_ALIGNED_REQUIRED) && !defined(NO_MISALIGNED_ACCESSES)
 #define NO_MISALIGNED_ACCESSES
 #endif