summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuido van Rossum <guido@python.org>1997-08-30 15:02:50 (GMT)
committerGuido van Rossum <guido@python.org>1997-08-30 15:02:50 (GMT)
commitd7ed683a7ead15583899d7f7fbfb9078139c6a80 (patch)
treefbfaebca84d160246a0e5d41b602fc93521991b7
parentb2afc811c2a0acf1a9429c848143da1879e32540 (diff)
downloadcpython-d7ed683a7ead15583899d7f7fbfb9078139c6a80.zip
cpython-d7ed683a7ead15583899d7f7fbfb9078139c6a80.tar.gz
cpython-d7ed683a7ead15583899d7f7fbfb9078139c6a80.tar.bz2
Inline PyObject_CallObject (Marc-Andre Lemburg).
-rw-r--r--Include/ceval.h5
-rw-r--r--Python/ceval.c5
2 files changed, 9 insertions, 1 deletions
diff --git a/Include/ceval.h b/Include/ceval.h
index 2805379..62977ba 100644
--- a/Include/ceval.h
+++ b/Include/ceval.h
@@ -37,10 +37,13 @@ PERFORMANCE OF THIS SOFTWARE.
/* Interface to random parts in ceval.c */
-PyObject *PyEval_CallObject Py_PROTO((PyObject *, PyObject *));
PyObject *PyEval_CallObjectWithKeywords
Py_PROTO((PyObject *, PyObject *, PyObject *));
+/* Inline this */
+#define PyEval_CallObject(func,arg) \
+ PyEval_CallObjectWithKeywords(func, arg, (PyObject *)NULL)
+
PyObject *PyEval_GetBuiltins Py_PROTO((void));
PyObject *PyEval_GetGlobals Py_PROTO((void));
PyObject *PyEval_GetLocals Py_PROTO((void));
diff --git a/Python/ceval.c b/Python/ceval.c
index 7c1d407..4bf53e8 100644
--- a/Python/ceval.c
+++ b/Python/ceval.c
@@ -2254,6 +2254,9 @@ Py_FlushLine()
/* External interface to call any callable object.
The arg must be a tuple or NULL. */
+#undef PyEval_CallObject
+/* for backward compatibility: export this interface */
+
PyObject *
PyEval_CallObject(func, arg)
PyObject *func;
@@ -2261,6 +2264,8 @@ PyEval_CallObject(func, arg)
{
return PyEval_CallObjectWithKeywords(func, arg, (PyObject *)NULL);
}
+#define PyEval_CallObject(func,arg) \
+ PyEval_CallObjectWithKeywords(func, arg, (PyObject *)NULL)
PyObject *
PyEval_CallObjectWithKeywords(func, arg, kw)