Several oopsies -- Py_ALLOBJECTS_H -> Py_PYTHON_H, temporarily removed

pystate.h (to be restored later when that code is debugged), removed
accessobject.h.

diff --git a/Include/Python.h b/Include/Python.h
index 63ffb1a3ba3446c8adeef3da910fa4e1658512af..ffc7e2c8b7219a4e1be1ff70c82dd76b09de3ace 100644 (file)
--- a/Include/Python.h
+++ b/Include/Python.h
@@ -1,5 +1,5 @@
-#ifndef Py_ALLOBJECTS_H
-#define Py_ALLOBJECTS_H
+#ifndef Py_PYTHON_H
+#define Py_PYTHON_H
 /* Since this is a "meta-include" file, no #ifdef __cplusplus / extern "C" { */
 
 /***********************************************************
@@ -64,7 +64,6 @@ PERFORMANCE OF THIS SOFTWARE.
 
 #include "pydebug.h"
 
-#include "accessobject.h"
 #include "intobject.h"
 #include "longobject.h"
 #include "floatobject.h"
@@ -96,8 +95,6 @@ PERFORMANCE OF THIS SOFTWARE.
 #include "import.h"
 #include "bltinmodule.h"
 
-#include "pystate.h"
-
 #include "abstract.h"
 
 #define PyArg_GetInt(v, a)     PyArg_Parse((v), "i", (a))
@@ -113,4 +110,4 @@ PERFORMANCE OF THIS SOFTWARE.
 
 #include "pyfpe.h"
 
-#endif /* !Py_ALLOBJECTS_H */
+#endif /* !Py_PYTHON_H */