diff options
| author | Anthony Baxter <anthonybaxter@gmail.com> | 2006-04-13 02:06:09 (GMT) |
|---|---|---|
| committer | Anthony Baxter <anthonybaxter@gmail.com> | 2006-04-13 02:06:09 (GMT) |
| commit | ac6bd46d5c30f4e643120aeef1ccd531801a2181 (patch) | |
| tree | f753bb13f17b1490ca3c26580c16f1d32ea748dc /Objects | |
| parent | 28c5f1fa169ddaec9ad4914e2c263e383390ae43 (diff) | |
| download | cpython-ac6bd46d5c30f4e643120aeef1ccd531801a2181.zip cpython-ac6bd46d5c30f4e643120aeef1ccd531801a2181.tar.gz cpython-ac6bd46d5c30f4e643120aeef1ccd531801a2181.tar.bz2 | |
spread the extern "C" { } magic pixie dust around. Python itself builds now
using a C++ compiler. Still lots and lots of errors in the modules built by
setup.py, and a bunch of warnings from g++ in the core.
Diffstat (limited to 'Objects')
| -rw-r--r-- | Objects/fileobject.c | 9 | ||||
| -rw-r--r-- | Objects/object.c | 9 | ||||
| -rw-r--r-- | Objects/unicodeobject.c | 10 |
3 files changed, 28 insertions, 0 deletions
diff --git a/Objects/fileobject.c b/Objects/fileobject.c index 20e71a3..185caa4 100644 --- a/Objects/fileobject.c +++ b/Objects/fileobject.c @@ -48,6 +48,10 @@ #define NEWLINE_LF 2 /* \n newline seen */ #define NEWLINE_CRLF 4 /* \r\n newline seen */ +#ifdef __cplusplus +extern "C" { +#endif + FILE * PyFile_AsFile(PyObject *f) { @@ -2441,3 +2445,8 @@ Py_UniversalNewlineFread(char *buf, size_t n, f->f_skipnextlf = skipnextlf; return dst - buf; } + +#ifdef __cplusplus +} +#endif + diff --git a/Objects/object.c b/Objects/object.c index 0ce4332..d3dda1b 100644 --- a/Objects/object.c +++ b/Objects/object.c @@ -3,6 +3,10 @@ #include "Python.h" +#ifdef __cplusplus +extern "C" { +#endif + #ifdef Py_REF_DEBUG Py_ssize_t _Py_RefTotal; @@ -2112,3 +2116,8 @@ _PyTrash_destroy_chain(void) --_PyTrash_delete_nesting; } } + +#ifdef __cplusplus +} +#endif + diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c index 1e0db15..30ae6f0 100644 --- a/Objects/unicodeobject.c +++ b/Objects/unicodeobject.c @@ -83,6 +83,11 @@ OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ + +#ifdef __cplusplus +extern "C" { +#endif + /* Free list for Unicode objects */ static PyUnicodeObject *unicode_freelist; static int unicode_freelist_size; @@ -7418,6 +7423,11 @@ _PyUnicode_Fini(void) unicode_freelist_size = 0; } +#ifdef __cplusplus +} +#endif + + /* Local variables: c-basic-offset: 4 |