summaryrefslogtreecommitdiffstats
path: root/Parser
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2008-06-13 00:26:50 (GMT)
committerBenjamin Peterson <benjamin@python.org>2008-06-13 00:26:50 (GMT)
commite68df0fbe51fc6980d48265e85664341f74fc9eb (patch)
tree4a6e06a0b0bd84c015718525809e581c828c5bec /Parser
parent762681b5152671802d315833a661a79d01f2c5e7 (diff)
downloadcpython-e68df0fbe51fc6980d48265e85664341f74fc9eb.zip
cpython-e68df0fbe51fc6980d48265e85664341f74fc9eb.tar.gz
cpython-e68df0fbe51fc6980d48265e85664341f74fc9eb.tar.bz2
Merged revisions 64212 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r64212 | benjamin.peterson | 2008-06-12 19:09:47 -0500 (Thu, 12 Jun 2008) | 3 lines #1683 prevent forking from interfering in threading storage This should prevent some test_multiprocessing failures ........
Diffstat (limited to 'Parser')
-rw-r--r--Parser/intrcheck.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/Parser/intrcheck.c b/Parser/intrcheck.c
index 5285dc5..06b5840 100644
--- a/Parser/intrcheck.c
+++ b/Parser/intrcheck.c
@@ -2,6 +2,7 @@
/* Check for interrupts */
#include "Python.h"
+#include "pythread.h"
#ifdef QUICKWIN
@@ -168,5 +169,6 @@ PyOS_AfterFork(void)
{
#ifdef WITH_THREAD
PyEval_ReInitThreads();
+ PyThread_ReInitTLS();
#endif
}