From 9a00e0a41c7bd51cfa9e24977fb81d4dd67e3973 Mon Sep 17 00:00:00 2001 From: Antoine Pitrou Date: Tue, 18 Jun 2013 22:17:48 +0200 Subject: Issue #18256: Compilation fix for recent AIX releases. Patch by David Edelsohn. --- Misc/ACKS | 1 + Misc/NEWS | 3 +++ Python/thread_pthread.h | 3 +++ 3 files changed, 7 insertions(+) diff --git a/Misc/ACKS b/Misc/ACKS index e8aac41..f3e427a 100644 --- a/Misc/ACKS +++ b/Misc/ACKS @@ -327,6 +327,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 index a9eeeff..d9b3f4e 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -141,6 +141,9 @@ Tools/Demos Build ----- +- Issue #18256: Compilation fix for recent AIX releases. Patch by + David Edelsohn. + - Issue #15172: Document NASM 2.10+ as requirement for building OpenSSL 1.0.1 on Windows. diff --git a/Python/thread_pthread.h b/Python/thread_pthread.h index 49713ce..e90ae7e 100644 --- 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 ); -- cgit v0.12 From 5e946bacefc9df0f81b3bd340efe89649889cc2e Mon Sep 17 00:00:00 2001 From: Antoine Pitrou Date: Tue, 18 Jun 2013 23:28:18 +0200 Subject: Fix compilation warning with gcc 4.8 (unused typedef) --- Objects/setobject.c | 1 - 1 file changed, 1 deletion(-) diff --git a/Objects/setobject.c b/Objects/setobject.c index c484dce..ea5a24c 100644 --- 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); -- cgit v0.12