merge heads

This commit is contained in:
Christian Heimes 2013-06-19 02:09:00 +02:00
commit d9a52f2625
3 changed files with 7 additions and 0 deletions

View File

@ -327,6 +327,7 @@ Maxim Dzumanenko
Walter Dörwald
Hans Eckardt
Rodolpho Eckhardt
David Edelsohn
John Edmonds
Grant Edwards
John Ehresman

View File

@ -143,6 +143,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.

View File

@ -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 );