pythonrun.h: added run_pyc_file

ceval.h: added Py_AddPendingCall
rest: modules using the new naming scheme must now include Python.h

diff --git a/Include/Python.h b/Include/Python.h
new file mode 100644 (file)
index 0000000..88ea8c0
--- /dev/null
+++ b/Include/Python.h
@@ -0,0 +1,3 @@
+/* Header file to be included by modules using new naming conventions */
+#include "allobjects.h"
+#include "rename1.h"

diff --git a/Include/allobjects.h b/Include/allobjects.h
index 0acee93c2929a29e7b07762faf908127bfbba0d4..d3cec8947efc49c188d1a6be008afea96db5f28e 100644 (file)
--- a/Include/allobjects.h
+++ b/Include/allobjects.h
@@ -76,8 +76,6 @@ OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include "modsupport.h"
 #include "ceval.h"
 
-#include "rename1.h"
-
 extern void fatal PROTO((char *));
 
 #ifdef __cplusplus

diff --git a/Include/ceval.h b/Include/ceval.h
index 3b16085b1c1fcf0500921ce317effaec742ab4b0..695c0c7b8da8e0602542a444b6944ffdd210ee3d 100644 (file)
--- a/Include/ceval.h
+++ b/Include/ceval.h
@@ -40,6 +40,8 @@ object *getframe PROTO((void));
 void printtraceback PROTO((object *));
 void flushline PROTO((void));
 
+int Py_AddPendingCall PROTO((int (*func) PROTO((ANY *)), ANY *arg));
+
 
 /* Interface for threads.
 

diff --git a/Include/pythonrun.h b/Include/pythonrun.h
index f2b9541b3c111643d3c1101314f9a0b3f1bed6cc..0ac9fb5b0a3abfe0b4a7c15ec739db1cc12b69f1 100644 (file)
--- a/Include/pythonrun.h
+++ b/Include/pythonrun.h
@@ -44,6 +44,7 @@ struct _node *parse_file PROTO((FILE *, char *, int));
 
 object *run_string PROTO((char *, int, object *, object *));
 object *run_file PROTO((FILE *, char *, int, object *, object *));
+object *run_pyc_file PROTO((FILE *, char *, object *, object *));
 
 object *compile_string PROTO((char *, char *, int));
 

diff --git a/Include/rename1.h b/Include/rename1.h
index 1b3d80a085e8cca8a89f92c0a64503f3de3582b5..22c5dcf80dcf039ef6242e1feb7e167aca2e4e51 100755 (executable)
--- a/Include/rename1.h
+++ b/Include/rename1.h
@@ -32,6 +32,11 @@ OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
    "new style" names (e.g. PyObject) with the old style Python source
    distribution. */
 
+/* Remove some symbols (these conflict with X11 symbols) */
+#undef True
+#undef False
+#undef None
+
 typedef ANY *PyUnivPtr;
 typedef struct methodlist PyMethodDef;
 
@@ -147,9 +152,9 @@ typedef struct methodlist PyMethodDef;
 #define _Py_NewReference NEWREF
 #define _Py_Dealloc DELREF
 #define _Py_ForgetReference UNREF
-#define Py_None None
-#define Py_False False
-#define Py_True True
+#define Py_None (&_Py_NoneStruct)
+#define Py_False ((object *) &_Py_ZeroStruct)
+#define Py_True ((object *) &_Py_TrueStruct)
 #define PyObject_Compare cmpobject
 #define PyObject_GetAttrString getattr
 #define PyObject_GetAttr getattro