summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAntoine Pitrou <solipsis@pitrou.net>2013-06-18 20:17:48 (GMT)
committerAntoine Pitrou <solipsis@pitrou.net>2013-06-18 20:17:48 (GMT)
commit9a00e0a41c7bd51cfa9e24977fb81d4dd67e3973 (patch)
tree78e4e12b2b98d2da22084acbe8add401be960db8
parentf0400baba81579483b9763e95babd8a5e92e1ef1 (diff)
downloadcpython-9a00e0a41c7bd51cfa9e24977fb81d4dd67e3973.zip
cpython-9a00e0a41c7bd51cfa9e24977fb81d4dd67e3973.tar.gz
cpython-9a00e0a41c7bd51cfa9e24977fb81d4dd67e3973.tar.bz2
Issue #18256: Compilation fix for recent AIX releases. Patch by David Edelsohn.
-rw-r--r--Misc/ACKS1
-rw-r--r--Misc/NEWS3
-rw-r--r--Python/thread_pthread.h3
3 files changed, 7 insertions, 0 deletions
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 );