diff options
| author | Charles-François Natali <neologix@free.fr> | 2011-07-23 18:15:43 +0200 |
|---|---|---|
| committer | Charles-François Natali <neologix@free.fr> | 2011-07-23 18:15:43 +0200 |
| commit | b4f0c255b55fb428481d238fede5cd449a2dbf66 (patch) | |
| tree | 3f5a5ed4bdc3ffc2a11f11fd3a291a91aacbf680 /Python/ceval.c | |
| parent | f0e05ad09cc79860c7f896d244e8af821f5a4813 (diff) | |
| download | cpython-b4f0c255b55fb428481d238fede5cd449a2dbf66.tar.gz | |
Issue 12620: Make pendingbusy flag static to Py_MakePendingCalls().
Diffstat (limited to 'Python/ceval.c')
| -rw-r--r-- | Python/ceval.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Python/ceval.c b/Python/ceval.c index 068da6f5f1..1c9153e276 100644 --- a/Python/ceval.c +++ b/Python/ceval.c @@ -491,7 +491,6 @@ static struct { } pendingcalls[NPENDINGCALLS]; static int pendingfirst = 0; static int pendinglast = 0; -static char pendingbusy = 0; int Py_AddPendingCall(int (*func)(void *), void *arg) @@ -538,6 +537,7 @@ Py_AddPendingCall(int (*func)(void *), void *arg) int Py_MakePendingCalls(void) { + static int busy = 0; int i; int r = 0; @@ -552,9 +552,9 @@ Py_MakePendingCalls(void) if (main_thread && PyThread_get_thread_ident() != main_thread) return 0; /* don't perform recursive pending calls */ - if (pendingbusy) + if (busy) return 0; - pendingbusy = 1; + busy = 1; /* perform a bounded number of calls, in case of recursion */ for (i=0; i<NPENDINGCALLS; i++) { int j; @@ -583,7 +583,7 @@ Py_MakePendingCalls(void) if (r) break; } - pendingbusy = 0; + busy = 0; return r; } |