Fix a bunch of imports to use code.h instead of compile.h.

Remove duplicate declarations from compile.h

diff --git a/Include/compile.h b/Include/compile.h
index 27a3f76a0f93daee3a493f4df546b255c057c082..01fd75660288c4687276df4e885bfce9edcb901c 100644 (file)
--- a/Include/compile.h
+++ b/Include/compile.h
@@ -11,11 +11,6 @@ extern "C" {
 /* Public interface */
 struct _node; /* Declare the existence of this type */
 PyAPI_FUNC(PyCodeObject *) PyNode_Compile(struct _node *, const char *);
-PyAPI_FUNC(PyCodeObject *) PyCode_New(
-       int, int, int, int, PyObject *, PyObject *, PyObject *, PyObject *,
-       PyObject *, PyObject *, PyObject *, PyObject *, int, PyObject *); 
-        /* same as struct above */
-PyAPI_FUNC(int) PyCode_Addr2Line(PyCodeObject *, int);
 
 /* Future feature support */
 

diff --git a/Modules/_hotshot.c b/Modules/_hotshot.c
index 08427284cc93066700ce147c3e383511e8b8c227..ddfd33655c03f1f91651e5a79fe8308e3d5fad5c 100644 (file)
--- a/Modules/_hotshot.c
+++ b/Modules/_hotshot.c
@@ -4,7 +4,6 @@
 
 #include "Python.h"
 #include "code.h"
-#include "compile.h"
 #include "eval.h"
 #include "frameobject.h"
 #include "structmember.h"

diff --git a/Modules/main.c b/Modules/main.c
index d511e59763d82d309af2465073b151771faef978..f6fa48bdd6dee17c369d8e2ead3c39385adb4fc2 100644 (file)
--- a/Modules/main.c
+++ b/Modules/main.c
@@ -2,7 +2,7 @@
 
 #include "Python.h"
 #include "osdefs.h"
-#include "compile.h" /* For CO_FUTURE_DIVISION */
+#include "code.h" /* For CO_FUTURE_DIVISION */
 #include "import.h"
 
 #ifdef __VMS

diff --git a/Modules/pyexpat.c b/Modules/pyexpat.c
index 438f7609cb2249fcc62b72bcd75abfe1b18090b3..c853160ba4a8bba5d3a46c5817bceb1d5f29710c 100644 (file)
--- a/Modules/pyexpat.c
+++ b/Modules/pyexpat.c
@@ -1,7 +1,6 @@
 #include "Python.h"
 #include <ctype.h>
 
-#include "compile.h"
 #include "frameobject.h"
 #include "expat.h"
 

diff --git a/Modules/zipimport.c b/Modules/zipimport.c
index e445300cbf96989d92332577db38c4ec5f80c87d..934367e82303d7e1ec18e0a38d24548131f5f3d5 100644 (file)
--- a/Modules/zipimport.c
+++ b/Modules/zipimport.c
@@ -2,7 +2,6 @@
 #include "structmember.h"
 #include "osdefs.h"
 #include "marshal.h"
-#include "compile.h"
 #include <time.h>
 
 

diff --git a/Objects/frameobject.c b/Objects/frameobject.c
index 8ebf5004ab902160d3fcdfdd1f706527fab7c07b..3535544918bd797b2ac5e0182aa82fc8631583e2 100644 (file)
--- a/Objects/frameobject.c
+++ b/Objects/frameobject.c
@@ -4,7 +4,6 @@
 #include "Python.h"
 
 #include "code.h"
-#include "compile.h"
 #include "frameobject.h"
 #include "opcode.h"
 #include "structmember.h"

diff --git a/Python/bltinmodule.c b/Python/bltinmodule.c
index 2d51531f19c35442dca30db74de22acc1949d2c8..fed657ffc77eb61fc328557e61292dd7c18408dd 100644 (file)
--- a/Python/bltinmodule.c
+++ b/Python/bltinmodule.c
@@ -4,7 +4,6 @@
 
 #include "node.h"
 #include "code.h"
-#include "compile.h"
 #include "eval.h"
 
 #include <ctype.h>

diff --git a/Python/marshal.c b/Python/marshal.c
index 4114c8edc3fb289cebeb04645c2f34d78f063451..1962f924ff37e524640626965c9b991ef2c5b9b7 100644 (file)
--- a/Python/marshal.c
+++ b/Python/marshal.c
@@ -7,7 +7,6 @@
 #include "Python.h"
 #include "longintrepr.h"
 #include "code.h"
-#include "compile.h"
 #include "marshal.h"
 
 /* High water mark to determine when the marshalled object is dangerously deep

diff --git a/Python/symtable.c b/Python/symtable.c
index 7af1390ffbe4f93339842e56da3cf5ae5eb0bad0..49d153bd3b840cf4ca61a4fa4bfc470c9d8b9d89 100644 (file)
--- a/Python/symtable.c
+++ b/Python/symtable.c
@@ -1,7 +1,6 @@
 #include "Python.h"
 #include "Python-ast.h"
 #include "code.h"
-#include "compile.h"
 #include "symtable.h"
 #include "structmember.h"