merge heads

tiran · tiran · commit dceec13dfb88 · 2013-06-19T02:08:41.000+02:00
diff --git a/Misc/ACKS b/Misc/ACKS
@@ -334,6 +334,7 @@ Maxim Dzumanenko
 Walter Dörwald
 Hans Eckardt
 Rodolpho Eckhardt
+David Edelsohn
 John Edmonds
 Grant Edwards
 John Ehresman
diff --git a/Misc/NEWS b/Misc/NEWS
@@ -539,6 +539,9 @@ IDLE
 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
@@ -214,7 +214,6 @@ static int
 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
@@ -170,6 +170,7 @@ static void
 PyThread__init_thread(void)
 {
 #if defined(_AIX) && defined(__GNUC__)
+    extern void pthread_init(void);
     pthread_init();
 #endif
 }
@@ -444,6 +445,7 @@ PyThread_free_lock(PyThread_type_lock lock)
     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 @@ PyThread_release_lock(PyThread_type_lock lock)
     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 );

Original file line number	Diff line number	Diff line change
`@@ -214,7 +214,6 @@ static int`
`214`	`214`	`set_insert_key(register PySetObject so, PyObject key, Py_hash_t hash)`
`215`	`215`	`{`
`216`	`216`	`register setentry *entry;`
`217`		`- typedef setentry (lookupfunc)(PySetObject , PyObject , Py_hash_t);`
`218`	`217`
`219`	`218`	`assert(so->lookup != NULL);`
`220`	`219`	`entry = so->lookup(so, key, hash);`