Mailing List Archive

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

Modified Files:
Tag: release22-maint
cStringIO.h descrobject.h iterobject.h
Log Message:
Backport patch (also pointed out in SF #607253):

date: 2002/03/30 08:57:12; author: loewis;
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.15.18.1
diff -C2 -d -r2.15 -r2.15.18.1
*** cStringIO.h 9 Jun 2001 07:59:43 -0000 2.15
--- cStringIO.h 4 Oct 2002 12:35:17 -0000 2.15.18.1
***************
*** 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.8.8.1
diff -C2 -d -r2.8 -r2.8.8.1
*** descrobject.h 22 Oct 2001 00:43:43 -0000 2.8
--- descrobject.h 4 Oct 2002 12:35:17 -0000 2.8.8.1
***************
*** 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.3.20.1
diff -C2 -d -r1.3 -r1.3.20.1
*** iterobject.h 23 Apr 2001 14:08:49 -0000 1.3
--- iterobject.h 4 Oct 2002 12:35:17 -0000 1.3.20.1
***************
*** 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 */
+