Mercurial > cpython-lru_cache-weakref
annotate Include/ceval.h @ 79675:c0a2294de787 2.7
Issue #16199: Backport 2to3 typo fix from 3.2.
| author | Chris Jerdonek <chris.jerdonek@gmail.com> |
|---|---|
| date | Thu, 11 Oct 2012 16:15:46 -0700 |
| parents | b36cb4602e21 |
| children |
| rev | line source |
|---|---|
|
1329
519c25039c6a
* Added support for X11 modules.
Guido van Rossum <guido@python.org>
parents:
1293
diff
changeset
|
1 #ifndef Py_CEVAL_H |
|
519c25039c6a
* Added support for X11 modules.
Guido van Rossum <guido@python.org>
parents:
1293
diff
changeset
|
2 #define Py_CEVAL_H |
|
519c25039c6a
* Added support for X11 modules.
Guido van Rossum <guido@python.org>
parents:
1293
diff
changeset
|
3 #ifdef __cplusplus |
|
519c25039c6a
* Added support for X11 modules.
Guido van Rossum <guido@python.org>
parents:
1293
diff
changeset
|
4 extern "C" { |
|
519c25039c6a
* Added support for X11 modules.
Guido van Rossum <guido@python.org>
parents:
1293
diff
changeset
|
5 #endif |
|
519c25039c6a
* Added support for X11 modules.
Guido van Rossum <guido@python.org>
parents:
1293
diff
changeset
|
6 |
| 145 | 7 |
| 926 | 8 /* Interface to random parts in ceval.c */ |
| 86 | 9 |
|
24752
c1eb668525e1
Excise DL_EXPORT from Include.
Mark Hammond <mhammond@skippinet.com.au>
parents:
18933
diff
changeset
|
10 PyAPI_FUNC(PyObject *) PyEval_CallObjectWithKeywords( |
|
61465
e38335d4df91
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
36501
diff
changeset
|
11 PyObject *, PyObject *, PyObject *); |
|
315
aef7e0a9119e
Added call_object interface
Guido van Rossum <guido@python.org>
parents:
145
diff
changeset
|
12 |
|
6206
77f5b6cbea66
Inline PyObject_CallObject (Marc-Andre Lemburg).
Guido van Rossum <guido@python.org>
parents:
5919
diff
changeset
|
13 /* Inline this */ |
|
77f5b6cbea66
Inline PyObject_CallObject (Marc-Andre Lemburg).
Guido van Rossum <guido@python.org>
parents:
5919
diff
changeset
|
14 #define PyEval_CallObject(func,arg) \ |
|
61465
e38335d4df91
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
36501
diff
changeset
|
15 PyEval_CallObjectWithKeywords(func, arg, (PyObject *)NULL) |
|
6206
77f5b6cbea66
Inline PyObject_CallObject (Marc-Andre Lemburg).
Guido van Rossum <guido@python.org>
parents:
5919
diff
changeset
|
16 |
|
35999
9541369b0dca
Add const to several API functions that take char *.
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
35298
diff
changeset
|
17 PyAPI_FUNC(PyObject *) PyEval_CallFunction(PyObject *obj, |
|
9541369b0dca
Add const to several API functions that take char *.
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
35298
diff
changeset
|
18 const char *format, ...); |
|
24752
c1eb668525e1
Excise DL_EXPORT from Include.
Mark Hammond <mhammond@skippinet.com.au>
parents:
18933
diff
changeset
|
19 PyAPI_FUNC(PyObject *) PyEval_CallMethod(PyObject *obj, |
|
35999
9541369b0dca
Add const to several API functions that take char *.
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
35298
diff
changeset
|
20 const char *methodname, |
|
9541369b0dca
Add const to several API functions that take char *.
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
35298
diff
changeset
|
21 const char *format, ...); |
|
8899
38544f828d74
Add missing prototypes for PyEval_CallFunction() and PyEval_CallMethod().
Guido van Rossum <guido@python.org>
parents:
6206
diff
changeset
|
22 |
|
24752
c1eb668525e1
Excise DL_EXPORT from Include.
Mark Hammond <mhammond@skippinet.com.au>
parents:
18933
diff
changeset
|
23 PyAPI_FUNC(void) PyEval_SetProfile(Py_tracefunc, PyObject *); |
|
c1eb668525e1
Excise DL_EXPORT from Include.
Mark Hammond <mhammond@skippinet.com.au>
parents:
18933
diff
changeset
|
24 PyAPI_FUNC(void) PyEval_SetTrace(Py_tracefunc, PyObject *); |
|
18325
fb35b3a22604
Revise the interface to the profiling and tracing support for the
Fred Drake <fdrake@acm.org>
parents:
17124
diff
changeset
|
25 |
|
27978
4b99a701defe
- PyEval_GetFrame() is now declared to return a PyFrameObject *
Guido van Rossum <guido@python.org>
parents:
27712
diff
changeset
|
26 struct _frame; /* Avoid including frameobject.h */ |
|
4b99a701defe
- PyEval_GetFrame() is now declared to return a PyFrameObject *
Guido van Rossum <guido@python.org>
parents:
27712
diff
changeset
|
27 |
|
24752
c1eb668525e1
Excise DL_EXPORT from Include.
Mark Hammond <mhammond@skippinet.com.au>
parents:
18933
diff
changeset
|
28 PyAPI_FUNC(PyObject *) PyEval_GetBuiltins(void); |
|
c1eb668525e1
Excise DL_EXPORT from Include.
Mark Hammond <mhammond@skippinet.com.au>
parents:
18933
diff
changeset
|
29 PyAPI_FUNC(PyObject *) PyEval_GetGlobals(void); |
|
c1eb668525e1
Excise DL_EXPORT from Include.
Mark Hammond <mhammond@skippinet.com.au>
parents:
18933
diff
changeset
|
30 PyAPI_FUNC(PyObject *) PyEval_GetLocals(void); |
|
27978
4b99a701defe
- PyEval_GetFrame() is now declared to return a PyFrameObject *
Guido van Rossum <guido@python.org>
parents:
27712
diff
changeset
|
31 PyAPI_FUNC(struct _frame *) PyEval_GetFrame(void); |
|
24752
c1eb668525e1
Excise DL_EXPORT from Include.
Mark Hammond <mhammond@skippinet.com.au>
parents:
18933
diff
changeset
|
32 PyAPI_FUNC(int) PyEval_GetRestricted(void); |
|
18611
fdb36a0c7e6e
Part way to allowing "from __future__ import generators" to communicate
Tim Peters <tim.peters@gmail.com>
parents:
18325
diff
changeset
|
33 |
|
fdb36a0c7e6e
Part way to allowing "from __future__ import generators" to communicate
Tim Peters <tim.peters@gmail.com>
parents:
18325
diff
changeset
|
34 /* Look at the current frame's (if any) code's co_flags, and turn on |
|
fdb36a0c7e6e
Part way to allowing "from __future__ import generators" to communicate
Tim Peters <tim.peters@gmail.com>
parents:
18325
diff
changeset
|
35 the corresponding compiler flags in cf->cf_flags. Return 1 if any |
|
fdb36a0c7e6e
Part way to allowing "from __future__ import generators" to communicate
Tim Peters <tim.peters@gmail.com>
parents:
18325
diff
changeset
|
36 flag was set, else return 0. */ |
|
24752
c1eb668525e1
Excise DL_EXPORT from Include.
Mark Hammond <mhammond@skippinet.com.au>
parents:
18933
diff
changeset
|
37 PyAPI_FUNC(int) PyEval_MergeCompilerFlags(PyCompilerFlags *cf); |
| 86 | 38 |
|
24752
c1eb668525e1
Excise DL_EXPORT from Include.
Mark Hammond <mhammond@skippinet.com.au>
parents:
18933
diff
changeset
|
39 PyAPI_FUNC(int) Py_FlushLine(void); |
| 926 | 40 |
|
24752
c1eb668525e1
Excise DL_EXPORT from Include.
Mark Hammond <mhammond@skippinet.com.au>
parents:
18933
diff
changeset
|
41 PyAPI_FUNC(int) Py_AddPendingCall(int (*func)(void *), void *arg); |
|
c1eb668525e1
Excise DL_EXPORT from Include.
Mark Hammond <mhammond@skippinet.com.au>
parents:
18933
diff
changeset
|
42 PyAPI_FUNC(int) Py_MakePendingCalls(void); |
|
1885
d3de2cad2c68
pythonrun.h: added run_pyc_file
Guido van Rossum <guido@python.org>
parents:
1746
diff
changeset
|
43 |
|
30801
c42c40034536
Deleting cyclic object comparison.
Armin Rigo <arigo@tunes.org>
parents:
27991
diff
changeset
|
44 /* Protection against deeply nested recursive calls */ |
|
24752
c1eb668525e1
Excise DL_EXPORT from Include.
Mark Hammond <mhammond@skippinet.com.au>
parents:
18933
diff
changeset
|
45 PyAPI_FUNC(void) Py_SetRecursionLimit(int); |
|
c1eb668525e1
Excise DL_EXPORT from Include.
Mark Hammond <mhammond@skippinet.com.au>
parents:
18933
diff
changeset
|
46 PyAPI_FUNC(int) Py_GetRecursionLimit(void); |
| 926 | 47 |
|
30801
c42c40034536
Deleting cyclic object comparison.
Armin Rigo <arigo@tunes.org>
parents:
27991
diff
changeset
|
48 #define Py_EnterRecursiveCall(where) \ |
|
61465
e38335d4df91
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
36501
diff
changeset
|
49 (_Py_MakeRecCheck(PyThreadState_GET()->recursion_depth) && \ |
|
e38335d4df91
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
36501
diff
changeset
|
50 _Py_CheckRecursiveCall(where)) |
|
e38335d4df91
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
36501
diff
changeset
|
51 #define Py_LeaveRecursiveCall() \ |
|
e38335d4df91
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
36501
diff
changeset
|
52 (--PyThreadState_GET()->recursion_depth) |
|
30801
c42c40034536
Deleting cyclic object comparison.
Armin Rigo <arigo@tunes.org>
parents:
27991
diff
changeset
|
53 PyAPI_FUNC(int) _Py_CheckRecursiveCall(char *where); |
|
c42c40034536
Deleting cyclic object comparison.
Armin Rigo <arigo@tunes.org>
parents:
27991
diff
changeset
|
54 PyAPI_DATA(int) _Py_CheckRecursionLimit; |
|
c42c40034536
Deleting cyclic object comparison.
Armin Rigo <arigo@tunes.org>
parents:
27991
diff
changeset
|
55 #ifdef USE_STACKCHECK |
|
c42c40034536
Deleting cyclic object comparison.
Armin Rigo <arigo@tunes.org>
parents:
27991
diff
changeset
|
56 # define _Py_MakeRecCheck(x) (++(x) > --_Py_CheckRecursionLimit) |
|
c42c40034536
Deleting cyclic object comparison.
Armin Rigo <arigo@tunes.org>
parents:
27991
diff
changeset
|
57 #else |
|
c42c40034536
Deleting cyclic object comparison.
Armin Rigo <arigo@tunes.org>
parents:
27991
diff
changeset
|
58 # define _Py_MakeRecCheck(x) (++(x) > _Py_CheckRecursionLimit) |
|
c42c40034536
Deleting cyclic object comparison.
Armin Rigo <arigo@tunes.org>
parents:
27991
diff
changeset
|
59 #endif |
|
c42c40034536
Deleting cyclic object comparison.
Armin Rigo <arigo@tunes.org>
parents:
27991
diff
changeset
|
60 |
|
35999
9541369b0dca
Add const to several API functions that take char *.
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
35298
diff
changeset
|
61 PyAPI_FUNC(const char *) PyEval_GetFuncName(PyObject *); |
|
9541369b0dca
Add const to several API functions that take char *.
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
35298
diff
changeset
|
62 PyAPI_FUNC(const char *) PyEval_GetFuncDesc(PyObject *); |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18611
diff
changeset
|
63 |
|
27712
16856c9514e0
Small function call optimization and special build option for call stats.
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
25108
diff
changeset
|
64 PyAPI_FUNC(PyObject *) PyEval_GetCallStats(PyObject *); |
|
32421
485d2ef43419
Patch #966493: Cleanup generator/eval_frame exposure.
Martin v. Löwis <martin@v.loewis.de>
parents:
32175
diff
changeset
|
65 PyAPI_FUNC(PyObject *) PyEval_EvalFrame(struct _frame *); |
|
35298
b2fe5f8fcfdd
PEP 342 implementation. Per Guido's comments, the generator throw()
Phillip J. Eby <pje@telecommunity.com>
parents:
33715
diff
changeset
|
66 PyAPI_FUNC(PyObject *) PyEval_EvalFrameEx(struct _frame *f, int exc); |
|
27712
16856c9514e0
Small function call optimization and special build option for call stats.
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
25108
diff
changeset
|
67 |
|
25108
3a26e352f0a6
replace thread state objects' ticker and checkinterval fields with two
Skip Montanaro <skip@pobox.com>
parents:
24752
diff
changeset
|
68 /* this used to be handled on a per-thread basis - now just two globals */ |
|
3a26e352f0a6
replace thread state objects' ticker and checkinterval fields with two
Skip Montanaro <skip@pobox.com>
parents:
24752
diff
changeset
|
69 PyAPI_DATA(volatile int) _Py_Ticker; |
|
3a26e352f0a6
replace thread state objects' ticker and checkinterval fields with two
Skip Montanaro <skip@pobox.com>
parents:
24752
diff
changeset
|
70 PyAPI_DATA(int) _Py_CheckInterval; |
|
3a26e352f0a6
replace thread state objects' ticker and checkinterval fields with two
Skip Montanaro <skip@pobox.com>
parents:
24752
diff
changeset
|
71 |
| 926 | 72 /* Interface for threads. |
| 73 | |
| 74 A module that plans to do a blocking system call (or something else | |
| 75 that lasts a long time and doesn't touch Python data) can allow other | |
| 76 threads to run as follows: | |
| 77 | |
|
61465
e38335d4df91
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
36501
diff
changeset
|
78 ...preparations here... |
|
e38335d4df91
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
36501
diff
changeset
|
79 Py_BEGIN_ALLOW_THREADS |
|
e38335d4df91
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
36501
diff
changeset
|
80 ...blocking system call here... |
|
e38335d4df91
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
36501
diff
changeset
|
81 Py_END_ALLOW_THREADS |
|
e38335d4df91
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
36501
diff
changeset
|
82 ...interpret result here... |
| 926 | 83 |
|
2129
05360cd616ae
The great renaming, phase two: all header files have been updated to
Guido van Rossum <guido@python.org>
parents:
2098
diff
changeset
|
84 The Py_BEGIN_ALLOW_THREADS/Py_END_ALLOW_THREADS pair expands to a |
|
05360cd616ae
The great renaming, phase two: all header files have been updated to
Guido van Rossum <guido@python.org>
parents:
2098
diff
changeset
|
85 {}-surrounded block. |
| 926 | 86 To leave the block in the middle (e.g., with return), you must insert |
|
14599
49a041330461
RET_SAVE references should be Py_BLOCK_THREADS references
Skip Montanaro <skip@pobox.com>
parents:
14375
diff
changeset
|
87 a line containing Py_BLOCK_THREADS before the return, e.g. |
| 926 | 88 |
|
61465
e38335d4df91
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
36501
diff
changeset
|
89 if (...premature_exit...) { |
|
e38335d4df91
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
36501
diff
changeset
|
90 Py_BLOCK_THREADS |
|
e38335d4df91
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
36501
diff
changeset
|
91 PyErr_SetFromErrno(PyExc_IOError); |
|
e38335d4df91
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
36501
diff
changeset
|
92 return NULL; |
|
e38335d4df91
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
36501
diff
changeset
|
93 } |
| 926 | 94 |
| 95 An alternative is: | |
| 96 | |
|
61465
e38335d4df91
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
36501
diff
changeset
|
97 Py_BLOCK_THREADS |
|
e38335d4df91
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
36501
diff
changeset
|
98 if (...premature_exit...) { |
|
e38335d4df91
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
36501
diff
changeset
|
99 PyErr_SetFromErrno(PyExc_IOError); |
|
e38335d4df91
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
36501
diff
changeset
|
100 return NULL; |
|
e38335d4df91
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
36501
diff
changeset
|
101 } |
|
e38335d4df91
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
36501
diff
changeset
|
102 Py_UNBLOCK_THREADS |
| 926 | 103 |
| 104 For convenience, that the value of 'errno' is restored across | |
|
14599
49a041330461
RET_SAVE references should be Py_BLOCK_THREADS references
Skip Montanaro <skip@pobox.com>
parents:
14375
diff
changeset
|
105 Py_END_ALLOW_THREADS and Py_BLOCK_THREADS. |
| 926 | 106 |
|
2129
05360cd616ae
The great renaming, phase two: all header files have been updated to
Guido van Rossum <guido@python.org>
parents:
2098
diff
changeset
|
107 WARNING: NEVER NEST CALLS TO Py_BEGIN_ALLOW_THREADS AND |
|
05360cd616ae
The great renaming, phase two: all header files have been updated to
Guido van Rossum <guido@python.org>
parents:
2098
diff
changeset
|
108 Py_END_ALLOW_THREADS!!! |
| 926 | 109 |
|
2129
05360cd616ae
The great renaming, phase two: all header files have been updated to
Guido van Rossum <guido@python.org>
parents:
2098
diff
changeset
|
110 The function PyEval_InitThreads() should be called only from |
| 926 | 111 initthread() in "threadmodule.c". |
| 112 | |
| 113 Note that not yet all candidates have been converted to use this | |
| 114 mechanism! | |
| 115 */ | |
| 116 | |
|
24752
c1eb668525e1
Excise DL_EXPORT from Include.
Mark Hammond <mhammond@skippinet.com.au>
parents:
18933
diff
changeset
|
117 PyAPI_FUNC(PyThreadState *) PyEval_SaveThread(void); |
|
c1eb668525e1
Excise DL_EXPORT from Include.
Mark Hammond <mhammond@skippinet.com.au>
parents:
18933
diff
changeset
|
118 PyAPI_FUNC(void) PyEval_RestoreThread(PyThreadState *); |
| 926 | 119 |
|
1746
1940892d2fe3
Merge alpha100 branch back to main trunk
Guido van Rossum <guido@python.org>
parents:
1391
diff
changeset
|
120 #ifdef WITH_THREAD |
| 926 | 121 |
|
33715
a46b76eb9053
SF patch 1044089: New C API function PyEval_ThreadsInitialized(), by Nick
Tim Peters <tim.peters@gmail.com>
parents:
32421
diff
changeset
|
122 PyAPI_FUNC(int) PyEval_ThreadsInitialized(void); |
|
24752
c1eb668525e1
Excise DL_EXPORT from Include.
Mark Hammond <mhammond@skippinet.com.au>
parents:
18933
diff
changeset
|
123 PyAPI_FUNC(void) PyEval_InitThreads(void); |
|
c1eb668525e1
Excise DL_EXPORT from Include.
Mark Hammond <mhammond@skippinet.com.au>
parents:
18933
diff
changeset
|
124 PyAPI_FUNC(void) PyEval_AcquireLock(void); |
|
c1eb668525e1
Excise DL_EXPORT from Include.
Mark Hammond <mhammond@skippinet.com.au>
parents:
18933
diff
changeset
|
125 PyAPI_FUNC(void) PyEval_ReleaseLock(void); |
|
c1eb668525e1
Excise DL_EXPORT from Include.
Mark Hammond <mhammond@skippinet.com.au>
parents:
18933
diff
changeset
|
126 PyAPI_FUNC(void) PyEval_AcquireThread(PyThreadState *tstate); |
|
c1eb668525e1
Excise DL_EXPORT from Include.
Mark Hammond <mhammond@skippinet.com.au>
parents:
18933
diff
changeset
|
127 PyAPI_FUNC(void) PyEval_ReleaseThread(PyThreadState *tstate); |
|
c1eb668525e1
Excise DL_EXPORT from Include.
Mark Hammond <mhammond@skippinet.com.au>
parents:
18933
diff
changeset
|
128 PyAPI_FUNC(void) PyEval_ReInitThreads(void); |
|
5846
852a1fa62a7c
PyEval_SaveThread() and PyEval_RestoreThread() now return/take a
Guido van Rossum <guido@python.org>
parents:
5604
diff
changeset
|
129 |
|
2129
05360cd616ae
The great renaming, phase two: all header files have been updated to
Guido van Rossum <guido@python.org>
parents:
2098
diff
changeset
|
130 #define Py_BEGIN_ALLOW_THREADS { \ |
|
61465
e38335d4df91
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
36501
diff
changeset
|
131 PyThreadState *_save; \ |
|
e38335d4df91
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
36501
diff
changeset
|
132 _save = PyEval_SaveThread(); |
|
e38335d4df91
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
36501
diff
changeset
|
133 #define Py_BLOCK_THREADS PyEval_RestoreThread(_save); |
|
e38335d4df91
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
36501
diff
changeset
|
134 #define Py_UNBLOCK_THREADS _save = PyEval_SaveThread(); |
|
e38335d4df91
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
36501
diff
changeset
|
135 #define Py_END_ALLOW_THREADS PyEval_RestoreThread(_save); \ |
|
e38335d4df91
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
36501
diff
changeset
|
136 } |
| 926 | 137 |
|
1746
1940892d2fe3
Merge alpha100 branch back to main trunk
Guido van Rossum <guido@python.org>
parents:
1391
diff
changeset
|
138 #else /* !WITH_THREAD */ |
| 926 | 139 |
|
2129
05360cd616ae
The great renaming, phase two: all header files have been updated to
Guido van Rossum <guido@python.org>
parents:
2098
diff
changeset
|
140 #define Py_BEGIN_ALLOW_THREADS { |
|
05360cd616ae
The great renaming, phase two: all header files have been updated to
Guido van Rossum <guido@python.org>
parents:
2098
diff
changeset
|
141 #define Py_BLOCK_THREADS |
|
05360cd616ae
The great renaming, phase two: all header files have been updated to
Guido van Rossum <guido@python.org>
parents:
2098
diff
changeset
|
142 #define Py_UNBLOCK_THREADS |
|
05360cd616ae
The great renaming, phase two: all header files have been updated to
Guido van Rossum <guido@python.org>
parents:
2098
diff
changeset
|
143 #define Py_END_ALLOW_THREADS } |
| 926 | 144 |
|
1746
1940892d2fe3
Merge alpha100 branch back to main trunk
Guido van Rossum <guido@python.org>
parents:
1391
diff
changeset
|
145 #endif /* !WITH_THREAD */ |
|
1329
519c25039c6a
* Added support for X11 modules.
Guido van Rossum <guido@python.org>
parents:
1293
diff
changeset
|
146 |
|
36501
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
35999
diff
changeset
|
147 PyAPI_FUNC(int) _PyEval_SliceIndex(PyObject *, Py_ssize_t *); |
| 12613 | 148 |
| 149 | |
|
1329
519c25039c6a
* Added support for X11 modules.
Guido van Rossum <guido@python.org>
parents:
1293
diff
changeset
|
150 #ifdef __cplusplus |
|
519c25039c6a
* Added support for X11 modules.
Guido van Rossum <guido@python.org>
parents:
1293
diff
changeset
|
151 } |
|
519c25039c6a
* Added support for X11 modules.
Guido van Rossum <guido@python.org>
parents:
1293
diff
changeset
|
152 #endif |
|
519c25039c6a
* Added support for X11 modules.
Guido van Rossum <guido@python.org>
parents:
1293
diff
changeset
|
153 #endif /* !Py_CEVAL_H */ |
