diff options
| author | Martin v. Löwis <martin@v.loewis.de> | 2002-03-30 08:57:12 (GMT) |
|---|---|---|
| committer | Martin v. Löwis <martin@v.loewis.de> | 2002-03-30 08:57:12 (GMT) |
| commit | 522cf1f6fb2dab78702af1f1f06b0855fab75149 (patch) | |
| tree | 335bb4e2454d3f44951890ee32ce7ebbcf3ff2ca | |
| parent | df4d1377ed103f157a5ba36601ddd03624d2223d (diff) | |
| download | cpython-522cf1f6fb2dab78702af1f1f06b0855fab75149.zip cpython-522cf1f6fb2dab78702af1f1f06b0855fab75149.tar.gz cpython-522cf1f6fb2dab78702af1f1f06b0855fab75149.tar.bz2 | |
Patch #536908: Add missing #include guards/extern "C".
| -rw-r--r-- | Include/cStringIO.h | 6 | ||||
| -rw-r--r-- | Include/descrobject.h | 10 | ||||
| -rw-r--r-- | Include/iterobject.h | 10 |
3 files changed, 26 insertions, 0 deletions
diff --git a/Include/cStringIO.h b/Include/cStringIO.h index cb8f337..fa3fcd7 100644 --- a/Include/cStringIO.h +++ b/Include/cStringIO.h @@ -1,5 +1,8 @@ #ifndef CSTRINGIO_INCLUDED #define CSTRINGIO_INCLUDED +#ifdef __cplusplus +extern "C" { +#endif /* cStringIO.h,v 1.4 1997/12/07 14:27:00 jim Exp @@ -128,4 +131,7 @@ xxxPyCObject_Import(char *module_name, char *name) #define PycString_IMPORT \ PycStringIO=(struct PycStringIO_CAPI*)xxxPyCObject_Import("cStringIO", "cStringIO_CAPI") +#ifdef __cplusplus +} +#endif #endif /* CSTRINGIO_INCLUDED */ diff --git a/Include/descrobject.h b/Include/descrobject.h index 918dd5a..6482e56 100644 --- a/Include/descrobject.h +++ b/Include/descrobject.h @@ -1,4 +1,9 @@ /* Descriptors */ +#ifndef Py_DESCROBJECT_H +#define Py_DESCROBJECT_H +#ifdef __cplusplus +extern "C" { +#endif typedef PyObject *(*getter)(PyObject *, void *); typedef int (*setter)(PyObject *, PyObject *, void *); @@ -78,3 +83,8 @@ extern DL_IMPORT(PyObject *) PyWrapper_New(PyObject *, PyObject *); extern DL_IMPORT(PyTypeObject) PyProperty_Type; +#ifdef __cplusplus +} +#endif +#endif /* !Py_DESCROBJECT_H */ + diff --git a/Include/iterobject.h b/Include/iterobject.h index bc18991..8abe678 100644 --- a/Include/iterobject.h +++ b/Include/iterobject.h @@ -1,4 +1,9 @@ +#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; @@ -11,3 +16,8 @@ extern DL_IMPORT(PyTypeObject) PyCallIter_Type; #define PyCallIter_Check(op) ((op)->ob_type == &PyCallIter_Type) extern DL_IMPORT(PyObject *) PyCallIter_New(PyObject *, PyObject *); +#ifdef __cplusplus +} +#endif +#endif /* !Py_ITEROBJECT_H */ + |