Inline PyObject_CallObject (Marc-Andre Lemburg).

diff --git a/Include/ceval.h b/Include/ceval.h
index 28053790c5420eb879f23687722e1264fb367c3d..62977badca05c127a954d0690a012fefd2416f11 100644 (file)
--- 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 7c1d407f19ce96bb34887426644799fcec3b444a..4bf53e8ce20b9ca73724522fa485a569a96cf52a 100644 (file)
--- 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)