SF # 607253, header file problems by Ralf W. Grosse-Kunstleve

Don't pollute the namespace when protecting against multiple header inclusion.
Prefix with Py_ and use standard naming convention Py_FILENAME_H.

diff --git a/Include/cStringIO.h b/Include/cStringIO.h
index 224f8ffcd82b072a30561093883df0dd1b5bfe16..50921d9e84d5e211c83cc40cc964bf2f30ebb78e 100644 (file)
--- a/Include/cStringIO.h
+++ b/Include/cStringIO.h
@@ -1,5 +1,5 @@
-#ifndef CSTRINGIO_INCLUDED
-#define CSTRINGIO_INCLUDED
+#ifndef Py_CSTRINGIO_H
+#define Py_CSTRINGIO_H
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -60,4 +60,4 @@ static struct PycStringIO_CAPI {
 #ifdef __cplusplus
 }
 #endif
-#endif /* CSTRINGIO_INCLUDED */
+#endif /* !Py_CSTRINGIO_H */

diff --git a/Include/complexobject.h b/Include/complexobject.h
index f5b755d60a2d46ca8e92b49a968df7900afb0b10..e59bf2ca957e5221d5a4f64c382511c271ce9558 100644 (file)
--- a/Include/complexobject.h
+++ b/Include/complexobject.h
@@ -1,7 +1,7 @@
 /* Complex number structure */
 
-#ifndef COMPLEXOBJECT_H
-#define COMPLEXOBJECT_H
+#ifndef Py_COMPLEXOBJECT_H
+#define Py_COMPLEXOBJECT_H
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -55,4 +55,4 @@ PyAPI_FUNC(Py_complex) PyComplex_AsCComplex(PyObject *op);
 #ifdef __cplusplus
 }
 #endif
-#endif /* !COMPLEXOBJECT_H */
+#endif /* !Py_COMPLEXOBJECT_H */