From: Charles-François Natali <neologix@free.fr>
Date: Thu, 2 Feb 2012 19:38:10 +0000 (+0100)
Subject: Merge.
X-Git-Tag: v3.3.0a1~265
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3f32fc87adfa5e14ee24c8dc94e629e74283d1ca;p=thirdparty%2FPython%2Fcpython.git

Merge.
---

3f32fc87adfa5e14ee24c8dc94e629e74283d1ca
diff --cc Modules/signalmodule.c
index c28f7afab030,32cd8bbece1f..e46f8cf1dcf8
--- a/Modules/signalmodule.c
+++ b/Modules/signalmodule.c
@@@ -1408,28 -999,5 +1411,27 @@@ PyOS_AfterFork(void
      main_thread = PyThread_get_thread_ident();
      main_pid = getpid();
      _PyImport_ReInitLock();
-     PyThread_ReInitTLS();
  #endif
  }
 +
 +int
 +_PyOS_IsMainThread(void)
 +{
 +#ifdef WITH_THREAD
 +    return PyThread_get_thread_ident() == main_thread;
 +#else
 +    return 1;
 +#endif
 +}
 +
 +#ifdef MS_WINDOWS
 +void *_PyOS_SigintEvent(void)
 +{
 +    /* Returns a manual-reset event which gets tripped whenever
 +       SIGINT is received.
 +
 +       Python.h does not include windows.h so we do cannot use HANDLE
 +       as the return type of this function.  We use void* instead. */
 +    return sigint_event;
 +}
 +#endif