[Python-checkins] cpython (merge 3.2 -> default): merge 3.2

[benjamin.peterson]

http://hg.python.org/cpython/rev/6d239e55e65a
changeset:   76292:6d239e55e65a
parent:      76290:06c4792143ab
parent:      76291:49f52d14b65c
user:        Benjamin Peterson <benjamin at python.org>
date:        Fri Apr 13 18:06:42 2012 -0400
summary:
  merge 3.2

files:
  Python/pystate.c |  4 ++--
  1 files changed, 2 insertions(+), 2 deletions(-)


diff --git a/Python/pystate.c b/Python/pystate.c
--- a/Python/pystate.c
+++ b/Python/pystate.c
@@ -726,10 +726,10 @@
         PyEval_SaveThread();
 }
 
+#endif /* WITH_THREAD */
+
 #ifdef __cplusplus
 }
 #endif
 
-#endif /* WITH_THREAD */
 
-

-- 
Repository URL: http://hg.python.org/cpython