[Python-checkins] python/dist/src/Include complexobject.h,2.9,2.9.12.1 cStringIO.h,2.15.18.1,2.15.18.2

[nnorwitz@users.sourceforge.net]

Update of /cvsroot/python/python/dist/src/Include
In directory usw-pr-cvs1:/tmp/cvs-serv7686/Include

Modified Files:
      Tag: release22-maint
	complexobject.h cStringIO.h 
Log Message:
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.


Index: complexobject.h
===================================================================
RCS file: /cvsroot/python/python/dist/src/Include/complexobject.h,v
retrieving revision 2.9
retrieving revision 2.9.12.1
diff -C2 -d -r2.9 -r2.9.12.1
*** complexobject.h	12 Sep 2001 19:12:48 -0000	2.9
--- complexobject.h	4 Oct 2002 12:50:11 -0000	2.9.12.1
***************
*** 1,6 ****
  /* Complex number structure */
  
! #ifndef COMPLEXOBJECT_H
! #define COMPLEXOBJECT_H
  #ifdef __cplusplus
  extern "C" {
--- 1,6 ----
  /* Complex number structure */
  
! #ifndef Py_COMPLEXOBJECT_H
! #define Py_COMPLEXOBJECT_H
  #ifdef __cplusplus
  extern "C" {
***************
*** 56,58 ****
  }
  #endif
! #endif /* !COMPLEXOBJECT_H */
--- 56,58 ----
  }
  #endif
! #endif /* !Py_COMPLEXOBJECT_H */

Index: cStringIO.h
===================================================================
RCS file: /cvsroot/python/python/dist/src/Include/cStringIO.h,v
retrieving revision 2.15.18.1
retrieving revision 2.15.18.2
diff -C2 -d -r2.15.18.1 -r2.15.18.2
*** cStringIO.h	4 Oct 2002 12:35:17 -0000	2.15.18.1
--- cStringIO.h	4 Oct 2002 12:50:12 -0000	2.15.18.2
***************
*** 1,4 ****
! #ifndef CSTRINGIO_INCLUDED
! #define CSTRINGIO_INCLUDED
  #ifdef __cplusplus
  extern "C" {
--- 1,4 ----
! #ifndef Py_CSTRINGIO_H
! #define Py_CSTRINGIO_H
  #ifdef __cplusplus
  extern "C" {
***************
*** 135,137 ****
  }
  #endif
! #endif /* CSTRINGIO_INCLUDED */
--- 135,137 ----
  }
  #endif
! #endif /* !Py_CSTRINGIO_H */