summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNeal Norwitz <nnorwitz@gmail.com>2002-10-04 12:50:12 (GMT)
committerNeal Norwitz <nnorwitz@gmail.com>2002-10-04 12:50:12 (GMT)
commitb3861ce31fd5b15ab54b65dc45c232e644277f1f (patch)
tree765415781b0b5963b216662df653b593da63d2ca
parentea2b436d50906f09102c0826985054003d5dc28b (diff)
downloadcpython-b3861ce31fd5b15ab54b65dc45c232e644277f1f.zip
cpython-b3861ce31fd5b15ab54b65dc45c232e644277f1f.tar.gz
cpython-b3861ce31fd5b15ab54b65dc45c232e644277f1f.tar.bz2
Backport last checkin:
SF # 607253, header file problems, reported 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.
-rw-r--r--Include/cStringIO.h6
-rw-r--r--Include/complexobject.h6
2 files changed, 6 insertions, 6 deletions
diff --git a/Include/cStringIO.h b/Include/cStringIO.h
index fa3fcd7..5bf1c46 100644
--- 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
@@ -134,4 +134,4 @@ xxxPyCObject_Import(char *module_name, char *name)
#ifdef __cplusplus
}
#endif
-#endif /* CSTRINGIO_INCLUDED */
+#endif /* !Py_CSTRINGIO_H */
diff --git a/Include/complexobject.h b/Include/complexobject.h
index b82eb90..e081c54 100644
--- 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 @@ extern DL_IMPORT(Py_complex) PyComplex_AsCComplex(PyObject *op);
#ifdef __cplusplus
}
#endif
-#endif /* !COMPLEXOBJECT_H */
+#endif /* !Py_COMPLEXOBJECT_H */