diff options
| author | Richard Oudkerk <shibturn@gmail.com> | 2013-10-17 13:31:51 (GMT) |
|---|---|---|
| committer | Richard Oudkerk <shibturn@gmail.com> | 2013-10-17 13:31:51 (GMT) |
| commit | 1eb509a585c402faa76da85095f1bdae5cd54ef2 (patch) | |
| tree | 695a767dc1969604a9c45ccd41e7136461361f13 | |
| parent | 1e2f67c05f38693f34f9d21b935141fa9ed624bc (diff) | |
| parent | a0f074f398f235c2075d1f57b766ff3e59b6fb43 (diff) | |
| download | cpython-1eb509a585c402faa76da85095f1bdae5cd54ef2.zip cpython-1eb509a585c402faa76da85095f1bdae5cd54ef2.tar.gz cpython-1eb509a585c402faa76da85095f1bdae5cd54ef2.tar.bz2 | |
Merge.
| -rw-r--r-- | Include/pythonrun.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Include/pythonrun.h b/Include/pythonrun.h index 70c412b..4cc4dcd 100644 --- a/Include/pythonrun.h +++ b/Include/pythonrun.h @@ -28,6 +28,9 @@ PyAPI_FUNC(wchar_t *) Py_GetProgramName(void); PyAPI_FUNC(void) Py_SetPythonHome(wchar_t *); PyAPI_FUNC(wchar_t *) Py_GetPythonHome(void); +PyAPI_FUNC(int) Py_SetStandardStreamEncoding(const char *encoding, + const char *errors); + PyAPI_FUNC(void) Py_Initialize(void); PyAPI_FUNC(void) Py_InitializeEx(int); #ifndef Py_LIMITED_API @@ -38,8 +41,6 @@ PyAPI_FUNC(int) Py_IsInitialized(void); PyAPI_FUNC(PyThreadState *) Py_NewInterpreter(void); PyAPI_FUNC(void) Py_EndInterpreter(PyThreadState *); -PyAPI_FUNC(int) Py_SetStandardStreamEncoding(const char *encoding, const char *errors); - #ifndef Py_LIMITED_API PyAPI_FUNC(int) PyRun_SimpleStringFlags(const char *, PyCompilerFlags *); PyAPI_FUNC(int) PyRun_AnyFileFlags(FILE *, const char *, PyCompilerFlags *); |