[Python-checkins] r45502 - in python/trunk: Include/abstract.h Objects/abstract.c

skip.montanaro python-checkins at python.org
Tue Apr 18 02:27:47 CEST 2006


Author: skip.montanaro
Date: Tue Apr 18 02:27:46 2006
New Revision: 45502

Modified:
   python/trunk/Include/abstract.h
   python/trunk/Objects/abstract.c
Log:
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.


Modified: python/trunk/Include/abstract.h
==============================================================================
--- python/trunk/Include/abstract.h	(original)
+++ python/trunk/Include/abstract.h	Tue Apr 18 02:27:46 2006
@@ -348,6 +348,11 @@
 	 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,
                                                         ...);

Modified: python/trunk/Objects/abstract.c
==============================================================================
--- python/trunk/Objects/abstract.c	(original)
+++ python/trunk/Objects/abstract.c	Tue Apr 18 02:27:46 2006
@@ -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 */
 


More information about the Python-checkins mailing list