added callable, removed run_pyc_file

diff --git a/Include/pythonrun.h b/Include/pythonrun.h
index 837d2f5497d56dd1b32d61234cd7c7ca1c9170ab..f24536775530df0cd23553e3a49fe625c4b82adc 100644 (file)
--- a/Include/pythonrun.h
+++ b/Include/pythonrun.h
@@ -44,7 +44,6 @@ struct _node *PyParser_SimpleParseFile Py_PROTO((FILE *, char *, int));
 
 PyObject *PyRun_String Py_PROTO((char *, int, PyObject *, PyObject *));
 PyObject *PyRun_File Py_PROTO((FILE *, char *, int, PyObject *, PyObject *));
-PyObject *run_pyc_file Py_PROTO((FILE *, char *, PyObject *, PyObject *));
 
 PyObject *Py_CompileString Py_PROTO((char *, char *, int));
 

diff --git a/Include/rename2.h b/Include/rename2.h
index e648a624409787c4d8f9dfcbd274a8f39c79e6af..4d9e2ab1e4553d72ed7c0409e6378b8746501c74 100644 (file)
--- a/Include/rename2.h
+++ b/Include/rename2.h
@@ -152,6 +152,7 @@ OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #define RET_SAVE Py_BLOCK_THREADS
 #define RES_SAVE Py_UNBLOCK_THREADS
 #define END_SAVE Py_END_ALLOW_THREADS
+#define callable PyCallable_Check
 #define is_floatobject PyFloat_Check
 #define is_intobject PyInt_Check
 #define is_longobject PyLong_Check