mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-27 10:50:04 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 13

merge heads

Browse source
This commit is contained in:
Christian Heimes 2013-06-19 02:08:41 +02:00
commit dceec13dfb
4 changed files with 7 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Misc/ACKS
View file

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

3
Misc/NEWS
View file

@ -539,6 +539,9 @@ IDLE
Build 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 - Issue #17547: In configure, explicitly pass -Wformat for the benefit for GCC
4.8. 4.8.

1
Objects/setobject.c
View file

@ -214,7 +214,6 @@ static int
set_insert_key(register PySetObject *so, PyObject *key, Py_hash_t hash) set_insert_key(register PySetObject *so, PyObject *key, Py_hash_t hash)
{ {
register setentry *entry; register setentry *entry;
typedef setentry *(*lookupfunc)(PySetObject *, PyObject *, Py_hash_t);
assert(so->lookup != NULL); assert(so->lookup != NULL);
entry = so->lookup(so, key, hash); entry = so->lookup(so, key, hash);

3
Python/thread_pthread.h
View file

@ -170,6 +170,7 @@ static void
PyThread__init_thread(void) PyThread__init_thread(void)
{ {
#if defined(_AIX) && defined(__GNUC__) #if defined(_AIX) && defined(__GNUC__)
extern void pthread_init(void);
pthread_init(); pthread_init();
#endif #endif
} }
@ -444,6 +445,7 @@ PyThread_free_lock(PyThread_type_lock lock)
pthread_lock *thelock = (pthread_lock *)lock; pthread_lock *thelock = (pthread_lock *)lock;
int status, error = 0; int status, error = 0;
(void) error; /* silence unused-but-set-variable warning */
dprintf(("PyThread_free_lock(%p) called\n", lock)); dprintf(("PyThread_free_lock(%p) called\n", lock));
/* some pthread-like implementations tie the mutex to the cond /* 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; pthread_lock *thelock = (pthread_lock *)lock;
int status, error = 0; int status, error = 0;
(void) error; /* silence unused-but-set-variable warning */
dprintf(("PyThread_release_lock(%p) called\n", lock)); dprintf(("PyThread_release_lock(%p) called\n", lock));
status = pthread_mutex_lock( &thelock->mut ); status = pthread_mutex_lock( &thelock->mut );