Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Fix the --with-cxx-main build.

This commit is contained in:
Collin Winter 2010-04-17 00:20:57 +00:00
parent 28a691b7fd
commit dfa66c1dda
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Include/Python.h
View File

@ -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 */

2
Modules/python.c
View File

@ -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;