From: Christian Heimes <christian@cheimes.de>
Date: Sun, 14 Oct 2012 02:17:50 +0000 (+0200)
Subject: get 64bit platforms without uint64 right again
X-Git-Tag: v3.4.0a1~2257
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=12e6a53b99298f8bb8ad00bf2f0ad22f78e92ae6;p=python

get 64bit platforms without uint64 right again
---

diff --git a/Modules/_sha3/sha3module.c b/Modules/_sha3/sha3module.c
index 38bda75f9d..ac568b83f9 100644
--- a/Modules/_sha3/sha3module.c
+++ b/Modules/_sha3/sha3module.c
@@ -98,9 +98,11 @@
 #ifdef __sparc
   /* On SPARC with Solaris CC opt64 fails with 'invalid address alignment' */
   #define KeccakOpt 32
-#elif SIZEOF_VOID_P == 8
+#elif SIZEOF_VOID_P == 8 && defined(PY_UINT64_T)
+  /* opt64 works only for 64bit platforms with unsigned int64 */
   #define KeccakOpt 64
-#elif SIZEOF_VOID_P == 4
+#else
+  /* opt32 is used for the remaining 32 and 64bit platforms */
   #define KeccakOpt 32
 #endif
 
@@ -109,7 +111,7 @@
   #define Unrolling 24
   #define UseBebigokimisa
   typedef PY_UINT64_T UINT64;
-#elif KeccakOpt == 32  && defined(PY_UINT64_T)
+#elif KeccakOpt == 32 && defined(PY_UINT64_T)
   /* 32bit platforms with unsigned int64 */
   #define Unrolling 2
   #define UseSchedule 3