merge 3.2
This commit is contained in:
commit
899ee613f7
|
@ -22,6 +22,9 @@ the expense of doing their own locking).
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#ifdef __cplusplus
|
||||||
|
extern "C" {
|
||||||
|
#endif
|
||||||
|
|
||||||
#ifdef WITH_THREAD
|
#ifdef WITH_THREAD
|
||||||
#include "pythread.h"
|
#include "pythread.h"
|
||||||
|
@ -30,10 +33,6 @@ static PyThread_type_lock head_mutex = NULL; /* Protects interp->tstate_head */
|
||||||
#define HEAD_LOCK() PyThread_acquire_lock(head_mutex, WAIT_LOCK)
|
#define HEAD_LOCK() PyThread_acquire_lock(head_mutex, WAIT_LOCK)
|
||||||
#define HEAD_UNLOCK() PyThread_release_lock(head_mutex)
|
#define HEAD_UNLOCK() PyThread_release_lock(head_mutex)
|
||||||
|
|
||||||
#ifdef __cplusplus
|
|
||||||
extern "C" {
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/* The single PyInterpreterState used by this process'
|
/* The single PyInterpreterState used by this process'
|
||||||
GILState implementation
|
GILState implementation
|
||||||
*/
|
*/
|
||||||
|
|
Loading…
Reference in New Issue