commit d3df2060a60a7ec349ad12f43a0dcb34d7fedcb4
author Christian Heimes <christian@cheimes.de> Sat Oct 06 17:14:02 2012 +0200
committer Christian Heimes <christian@cheimes.de> Sat Oct 06 17:14:02 2012 +0200
tree dfce2ccb9ed3bd11501f8e0056c5042f50d22057
parent 6314d164c9ea6fb7ef52c0ccbaa335f4d3fab9cb
parent 1d0d541259146f4ed33e3a606a74f227fd6d5fa3

merge

Modules/_sha3/sha3module.c

diff --git a/Modules/_sha3/sha3module.c b/Modules/_sha3/sha3module.c
index 2ce207d..1fdc9b7 100644
--- a/Modules/_sha3/sha3module.c
+++ b/Modules/_sha3/sha3module.c
@@ -110,7 +110,6 @@
   typedef PY_UINT64_T UINT64;
 #else
   /* 32 or 64bit platforms without unsigned int64 */
-  #warning no uint64_t available, force Keccak opt32 with interleave tables
   #define KeccakImplementation 32
   #define Unrolling 2
   #define UseSchedule 3

Objects/abstract.c

diff --git a/Objects/abstract.c b/Objects/abstract.c
index b6fc478..eb3a766 100644
--- a/Objects/abstract.c
+++ b/Objects/abstract.c
@@ -78,8 +78,10 @@
 Py_ssize_t
 PyObject_LengthHint(PyObject *o, Py_ssize_t defaultvalue)
 {
+    PyObject *hint;
+    Py_ssize_t res;
     _Py_IDENTIFIER(__length_hint__);
-    Py_ssize_t res = PyObject_Length(o);
+    res = PyObject_Length(o);
     if (res < 0 && PyErr_Occurred()) {
         if (!PyErr_ExceptionMatches(PyExc_TypeError)) {
             return -1;
@@ -89,7 +91,7 @@
     else {
         return res;
     }
-    PyObject *hint = _PyObject_LookupSpecial(o, &PyId___length_hint__);
+    hint = _PyObject_LookupSpecial(o, &PyId___length_hint__);
     if (hint == NULL) {
         if (PyErr_Occurred()) {
             return -1;