diff options
| author | Collin Winter <collinw@gmail.com> | 2010-04-17 00:20:57 (GMT) |
|---|---|---|
| committer | Collin Winter <collinw@gmail.com> | 2010-04-17 00:20:57 (GMT) |
| commit | dfa66c1dda47ffea27500c871bbc867d2bce29bd (patch) | |
| tree | 39d1b205ff338ce3f2a68d7199bc94266f394a76 | |
| parent | 28a691b7fdde1b8abafa4c4a5025e6bfa44f48b9 (diff) | |
| download | cpython-dfa66c1dda47ffea27500c871bbc867d2bce29bd.zip cpython-dfa66c1dda47ffea27500c871bbc867d2bce29bd.tar.gz cpython-dfa66c1dda47ffea27500c871bbc867d2bce29bd.tar.bz2 | |
Fix the --with-cxx-main build.
| -rw-r--r-- | Include/Python.h | 6 | ||||
| -rw-r--r-- | Modules/python.c | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/Include/Python.h b/Include/Python.h index 315d6ec..9b26d16 100644 --- a/Include/Python.h +++ b/Include/Python.h @@ -120,11 +120,17 @@ #include "pystrcmp.h" #include "dtoa.h" +#ifdef __cplusplus +extern "C" { +#endif /* _Py_Mangle is defined in compile.c */ PyAPI_FUNC(PyObject*) _Py_Mangle(PyObject *p, PyObject *name); /* _Py_char2wchar lives in python.c */ PyAPI_FUNC(wchar_t *) _Py_char2wchar(char *); +#ifdef __cplusplus +} +#endif /* Convert a possibly signed character to a nonnegative int */ /* XXX This assumes characters are 8 bits wide */ diff --git a/Modules/python.c b/Modules/python.c index 7bc9c3a..f5d3870 100644 --- a/Modules/python.c +++ b/Modules/python.c @@ -57,7 +57,7 @@ _Py_char2wchar(char* arg) /* Overallocate; as multi-byte characters are in the argument, the actual output could use less memory. */ argsize = strlen(arg) + 1; - res = PyMem_Malloc(argsize*sizeof(wchar_t)); + res = (wchar_t*)PyMem_Malloc(argsize*sizeof(wchar_t)); if (!res) goto oom; in = (unsigned char*)arg; out = res; |