merge 3.2

899ee613 · Benjamin Peterson · c287062f · 43162b8a · 899ee613
Commit 899ee613 authored Apr 13, 2012 by Benjamin Peterson
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 4 deletions

Python/pystate.c Python/pystate.c +3 -4

No files found.
--- 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
 */