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.

diff --git a/Include/abstract.h b/Include/abstract.h
index 3dcc0b03714025b565b7bb07552f6b842f6c079c..f96b297eff94a3e0960947e314d92180e79a5ea3 100644 (file)
--- 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 7e2cdbcfa09b86d0f010400f4b7a6b07a640752d..f7d6f5ac6a615379edf937929328bed2463af1c2 100644 (file)
--- 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 */