From f20ca766fe404a20daea29230f161a0eb71bb489 Mon Sep 17 00:00:00 2001 From: Victor Stinner Date: Mon, 7 Feb 2022 16:22:24 +0100 Subject: [PATCH] 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. --- Modules/_sha3/sha3module.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Modules/_sha3/sha3module.c b/Modules/_sha3/sha3module.c index bfa96616df0..bffd177c0e7 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