diff options
| author | Berker Peksag <berker.peksag@gmail.com> | 2016-06-17 10:25:01 (GMT) |
|---|---|---|
| committer | Berker Peksag <berker.peksag@gmail.com> | 2016-06-17 10:25:01 (GMT) |
| commit | 531396c764d12ca6ec02a4e199350fee1879499a (patch) | |
| tree | 0ac3177f163f5ab95931947e6f6229e63291063b | |
| parent | d4b45cb9ca426df78aee5ceb53b65aa826498186 (diff) | |
| download | cpython-531396c764d12ca6ec02a4e199350fee1879499a.zip cpython-531396c764d12ca6ec02a4e199350fee1879499a.tar.gz cpython-531396c764d12ca6ec02a4e199350fee1879499a.tar.bz2 | |
Issue #27336: Fix compilation failures --without-threads
| -rw-r--r-- | Parser/pgenmain.c | 5 | ||||
| -rw-r--r-- | Python/pylifecycle.c | 2 | ||||
| -rw-r--r-- | Python/traceback.c | 2 |
3 files changed, 6 insertions, 3 deletions
diff --git a/Parser/pgenmain.c b/Parser/pgenmain.c index d5a13fe..e9d3082 100644 --- a/Parser/pgenmain.c +++ b/Parser/pgenmain.c @@ -38,12 +38,13 @@ Py_Exit(int sts) } #ifdef WITH_THREAD -/* Functions needed by obmalloc.c */ +/* Needed by obmalloc.c */ int PyGILState_Check(void) { return 1; } +#endif + void _PyMem_DumpTraceback(int fd, const void *ptr) {} -#endif int main(int argc, char **argv) diff --git a/Python/pylifecycle.c b/Python/pylifecycle.c index 7187fe4..12a5d4c 100644 --- a/Python/pylifecycle.c +++ b/Python/pylifecycle.c @@ -746,9 +746,11 @@ Py_NewInterpreter(void) if (!initialized) Py_FatalError("Py_NewInterpreter: call Py_Initialize first"); +#if WITH_THREAD /* Issue #10915, #15751: The GIL API doesn't work with multiple interpreters: disable PyGILState_Check(). */ _PyGILState_check_enabled = 0; +#endif interp = PyInterpreterState_New(); if (interp == NULL) diff --git a/Python/traceback.c b/Python/traceback.c index 62a6b1e..59552ca 100644 --- a/Python/traceback.c +++ b/Python/traceback.c @@ -745,7 +745,7 @@ _Py_DumpTracebackThreads(int fd, PyInterpreterState *interp, if (current_tstate == NULL) { /* Call _PyThreadState_UncheckedGet() instead of PyThreadState_Get() to not fail with a fatal error if the thread state is NULL. */ - current_thread = _PyThreadState_UncheckedGet(); + current_tstate = _PyThreadState_UncheckedGet(); } if (interp == NULL) { |