summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAntoine Pitrou <solipsis@pitrou.net>2013-06-18 20:19:11 (GMT)
committerAntoine Pitrou <solipsis@pitrou.net>2013-06-18 20:19:11 (GMT)
commit1a1a06ee36f06782a6fdf60e9a245a6359a0b95e (patch)
treed375720115a62a27834c4c0c8a4f2ec83d508047
parent360b89ca5e388298a9910b917b1add21a05b9a1b (diff)
parent9a00e0a41c7bd51cfa9e24977fb81d4dd67e3973 (diff)
downloadcpython-1a1a06ee36f06782a6fdf60e9a245a6359a0b95e.zip
cpython-1a1a06ee36f06782a6fdf60e9a245a6359a0b95e.tar.gz
cpython-1a1a06ee36f06782a6fdf60e9a245a6359a0b95e.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 ec8d94f..ae937af 100644
--- 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
index aa76923..f1d6bf2 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -537,6 +537,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/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 );