[Python-checkins] cpython (merge default -> default): merge heads

[christian.heimes]

http://hg.python.org/cpython/rev/ac94b96b1aa7
changeset:   84211:ac94b96b1aa7
parent:      84210:14748397fc57
parent:      84208:626a8e49f2a9
user:        Christian Heimes <christian at cheimes.de>
date:        Wed Jun 19 02:08:41 2013 +0200
summary:
  merge heads

files:
  Misc/ACKS               |  1 +
  Misc/NEWS               |  3 +++
  Objects/setobject.c     |  1 -
  Python/thread_pthread.h |  3 +++
  4 files changed, 7 insertions(+), 1 deletions(-)


diff --git a/Misc/ACKS b/Misc/ACKS
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -334,6 +334,7 @@
 Walter Dörwald
 Hans Eckardt
 Rodolpho Eckhardt
+David Edelsohn
 John Edmonds
 Grant Edwards
 John Ehresman
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -539,6 +539,9 @@
 Build
 -----
 
+- Issue #18256: Compilation fix for recent AIX releases.  Patch by
+  David Edelsohn.
+
 - Issue #17547: In configure, explicitly pass -Wformat for the benefit for GCC
   4.8.
 
diff --git a/Objects/setobject.c b/Objects/setobject.c
--- a/Objects/setobject.c
+++ b/Objects/setobject.c
@@ -214,7 +214,6 @@
 set_insert_key(register PySetObject *so, PyObject *key, Py_hash_t hash)
 {
     register setentry *entry;
-    typedef setentry *(*lookupfunc)(PySetObject *, PyObject *, Py_hash_t);
 
     assert(so->lookup != NULL);
     entry = so->lookup(so, key, hash);
diff --git a/Python/thread_pthread.h b/Python/thread_pthread.h
--- a/Python/thread_pthread.h
+++ b/Python/thread_pthread.h
@@ -170,6 +170,7 @@
 PyThread__init_thread(void)
 {
 #if defined(_AIX) && defined(__GNUC__)
+    extern void pthread_init(void);
     pthread_init();
 #endif
 }
@@ -444,6 +445,7 @@
     pthread_lock *thelock = (pthread_lock *)lock;
     int status, error = 0;
 
+    (void) error; /* silence unused-but-set-variable warning */
     dprintf(("PyThread_free_lock(%p) called\n", lock));
 
     /* some pthread-like implementations tie the mutex to the cond
@@ -530,6 +532,7 @@
     pthread_lock *thelock = (pthread_lock *)lock;
     int status, error = 0;
 
+    (void) error; /* silence unused-but-set-variable warning */
     dprintf(("PyThread_release_lock(%p) called\n", lock));
 
     status = pthread_mutex_lock( &thelock->mut );

-- 
Repository URL: http://hg.python.org/cpython