diff options
| author | Benjamin Peterson <benjamin@python.org> | 2012-04-13 15:59:52 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2012-04-13 15:59:52 (GMT) |
| commit | 899ee613f7b4a4f5967943095d5fbc9522356ad3 (patch) | |
| tree | 96ce318f0541cfe92588d555fc054a5cb7fa1c3b /Python/pystate.c | |
| parent | c287062fcf8b891db3b982e628cb297165b766e2 (diff) | |
| parent | 43162b8a02f278c74feb8bba7f20d93445198b60 (diff) | |
| download | cpython-899ee613f7b4a4f5967943095d5fbc9522356ad3.zip cpython-899ee613f7b4a4f5967943095d5fbc9522356ad3.tar.gz cpython-899ee613f7b4a4f5967943095d5fbc9522356ad3.tar.bz2 | |
merge 3.2
Diffstat (limited to 'Python/pystate.c')
| -rw-r--r-- | Python/pystate.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/Python/pystate.c b/Python/pystate.c index 3b4c6a2..9fc4c12 100644 --- a/Python/pystate.c +++ b/Python/pystate.c @@ -22,6 +22,9 @@ the expense of doing their own locking). #endif #endif +#ifdef __cplusplus +extern "C" { +#endif #ifdef WITH_THREAD #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_UNLOCK() PyThread_release_lock(head_mutex) -#ifdef __cplusplus -extern "C" { -#endif - /* The single PyInterpreterState used by this process' GILState implementation */ |