[Python-checkins] cpython: get 64bit platforms without uint64 right again
christian.heimes
python-checkins at python.org
Sun Oct 14 04:19:59 CEST 2012
http://hg.python.org/cpython/rev/568312ea04fa
changeset: 79719:568312ea04fa
user: Christian Heimes <christian at cheimes.de>
date: Sun Oct 14 04:17:50 2012 +0200
summary:
get 64bit platforms without uint64 right again
files:
Modules/_sha3/sha3module.c | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/Modules/_sha3/sha3module.c b/Modules/_sha3/sha3module.c
--- 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
--
Repository URL: http://hg.python.org/cpython
More information about the Python-checkins
mailing list