From: Antoine Pitrou <solipsis@pitrou.net>
Date: Tue, 18 Jun 2013 20:17:48 +0000 (+0200)
Subject: Issue #18256: Compilation fix for recent AIX releases.  Patch by David Edelsohn.
X-Git-Tag: v2.7.6rc1~350
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7e9cec04abba6c5c1ac36634129462f434c1083b;p=thirdparty%2FPython%2Fcpython.git

Issue #18256: Compilation fix for recent AIX releases.  Patch by David Edelsohn.
---

diff --git a/Misc/ACKS b/Misc/ACKS
index 15daf505aa2f..fc0d9d216be7 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -270,6 +270,7 @@ Josip Dzolonga
 Maxim Dzumanenko
 Walter Dörwald
 Hans Eckardt
+David Edelsohn
 Grant Edwards
 John Ehresman
 Eric Eisner
diff --git a/Misc/NEWS b/Misc/NEWS
index 2bbcd7059f8f..941818340ca4 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -49,6 +49,9 @@ Library
 Build
 -----
 
+- Issue #18256: Compilation fix for recent AIX releases.  Patch by
+  David Edelsohn.
+
 - Issue #18098: The deprecated OS X Build Applet.app fails to build on
   OS X 10.8 systems because the Apple-deprecated QuickDraw headers have
   been removed from Xcode 4.  Skip building it in this case.
diff --git a/Python/thread_pthread.h b/Python/thread_pthread.h
index c1c92d1a15eb..c9ed796cd0fe 100644
--- a/Python/thread_pthread.h
+++ b/Python/thread_pthread.h
@@ -145,6 +145,7 @@ static void
 PyThread__init_thread(void)
 {
 #if defined(_AIX) && defined(__GNUC__)
+    extern void pthread_init(void);
     pthread_init();
 #endif
 }
@@ -394,6 +395,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));
 
     status = pthread_mutex_destroy( &thelock->mut );
@@ -445,6 +447,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 );