[Python-checkins] python/dist/src/Include complexobject.h,2.10,2.11 cStringIO.h,2.18,2.19

nnorwitz@users.sourceforge.net nnorwitz@users.sourceforge.net
Fri, 04 Oct 2002 05:43:05 -0700


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

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


Index: complexobject.h
===================================================================
RCS file: /cvsroot/python/python/dist/src/Include/complexobject.h,v
retrieving revision 2.10
retrieving revision 2.11
diff -C2 -d -r2.10 -r2.11
*** complexobject.h	12 Aug 2002 07:21:56 -0000	2.10
--- complexobject.h	4 Oct 2002 12:43:02 -0000	2.11
***************
*** 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.18
retrieving revision 2.19
diff -C2 -d -r2.18 -r2.19
*** cStringIO.h	5 Aug 2002 18:20:01 -0000	2.18
--- cStringIO.h	4 Oct 2002 12:43:02 -0000	2.19
***************
*** 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" {
***************
*** 61,63 ****
  }
  #endif
! #endif /* CSTRINGIO_INCLUDED */
--- 61,63 ----
  }
  #endif
! #endif /* !Py_CSTRINGIO_H */