[Python-checkins] CVS: python/dist/src/Include cStringIO.h,2.15,2.16 descrobject.h,2.8,2.9 iterobject.h,1.3,1.4

[Martin v. L?wis]

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

Modified Files:
	cStringIO.h descrobject.h iterobject.h 
Log Message:
Patch #536908: Add missing #include guards/extern "C".


Index: cStringIO.h
===================================================================
RCS file: /cvsroot/python/python/dist/src/Include/cStringIO.h,v
retrieving revision 2.15
retrieving revision 2.16
diff -C2 -d -r2.15 -r2.16
*** cStringIO.h	9 Jun 2001 07:59:43 -0000	2.15
--- cStringIO.h	30 Mar 2002 08:57:12 -0000	2.16
***************
*** 1,4 ****
--- 1,7 ----
  #ifndef CSTRINGIO_INCLUDED
  #define CSTRINGIO_INCLUDED
+ #ifdef __cplusplus
+ extern "C" {
+ #endif
  /*
  
***************
*** 129,131 ****
--- 132,137 ----
    PycStringIO=(struct PycStringIO_CAPI*)xxxPyCObject_Import("cStringIO", "cStringIO_CAPI")
  
+ #ifdef __cplusplus
+ }
+ #endif
  #endif /* CSTRINGIO_INCLUDED */

Index: descrobject.h
===================================================================
RCS file: /cvsroot/python/python/dist/src/Include/descrobject.h,v
retrieving revision 2.8
retrieving revision 2.9
diff -C2 -d -r2.8 -r2.9
*** descrobject.h	22 Oct 2001 00:43:43 -0000	2.8
--- descrobject.h	30 Mar 2002 08:57:12 -0000	2.9
***************
*** 1,3 ****
--- 1,8 ----
  /* Descriptors */
+ #ifndef Py_DESCROBJECT_H
+ #define Py_DESCROBJECT_H
+ #ifdef __cplusplus
+ extern "C" {
+ #endif
  
  typedef PyObject *(*getter)(PyObject *, void *);
***************
*** 79,80 ****
--- 84,90 ----
  
  extern DL_IMPORT(PyTypeObject) PyProperty_Type;
+ #ifdef __cplusplus
+ }
+ #endif
+ #endif /* !Py_DESCROBJECT_H */
+ 

Index: iterobject.h
===================================================================
RCS file: /cvsroot/python/python/dist/src/Include/iterobject.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** iterobject.h	23 Apr 2001 14:08:49 -0000	1.3
--- iterobject.h	30 Mar 2002 08:57:12 -0000	1.4
***************
*** 1,3 ****
--- 1,8 ----
+ #ifndef Py_ITEROBJECT_H
+ #define Py_ITEROBJECT_H
  /* Iterators (the basic kind, over a sequence) */
+ #ifdef __cplusplus
+ extern "C" {
+ #endif
  
  extern DL_IMPORT(PyTypeObject) PySeqIter_Type;
***************
*** 12,13 ****
--- 17,23 ----
  
  extern DL_IMPORT(PyObject *) PyCallIter_New(PyObject *, PyObject *);
+ #ifdef __cplusplus
+ }
+ #endif
+ #endif /* !Py_ITEROBJECT_H */
+