From 54e964d25387f4a78faa207c22a9d6bdb3ac2c47 Mon Sep 17 00:00:00 2001 From: Skip Montanaro Date: Tue, 18 Apr 2006 00:27:46 +0000 Subject: [PATCH] C++ compilation cleanup: Migrate declaration of _PyObject_Call(Function|Method)_SizeT into Include/abstract.h. This gets them under the umbrella of the extern "C" { ... } block in that file. --- Include/abstract.h | 5 +++++ Objects/abstract.c | 7 ------- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/Include/abstract.h b/Include/abstract.h index 3dcc0b03714..f96b297eff9 100644 --- a/Include/abstract.h +++ b/Include/abstract.h @@ -348,6 +348,11 @@ xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx*/ Python expression: o.method(args). */ + PyAPI_FUNC(PyObject *) _PyObject_CallFunction_SizeT(PyObject *callable, + char *format, ...); + PyAPI_FUNC(PyObject *) _PyObject_CallMethod_SizeT(PyObject *o, + char *name, + char *format, ...); PyAPI_FUNC(PyObject *) PyObject_CallFunctionObjArgs(PyObject *callable, ...); diff --git a/Objects/abstract.c b/Objects/abstract.c index 7e2cdbcfa09..f7d6f5ac6a6 100644 --- a/Objects/abstract.c +++ b/Objects/abstract.c @@ -10,13 +10,6 @@ #define HASINDEX(o) PyType_HasFeature((o)->ob_type, Py_TPFLAGS_HAVE_INDEX) -#ifdef HAVE_DECLSPEC_DLL -PyAPI_FUNC(PyObject *) _PyObject_CallFunction_SizeT(PyObject *callable_object, - char *format, ...); -PyAPI_FUNC(PyObject *) _PyObject_CallMethod_SizeT(PyObject *o, char *m, - char *format, ...); -#endif - /* Shorthands to return certain errors */