[Python-checkins] cpython (merge default -> default): Merge.
richard.oudkerk
python-checkins at python.org
Thu Oct 17 15:33:03 CEST 2013
http://hg.python.org/cpython/rev/5cc9cbfb5cff
changeset: 86402:5cc9cbfb5cff
parent: 86401:9558e9360afc
parent: 86400:537e13ca7683
user: Richard Oudkerk <shibturn at gmail.com>
date: Thu Oct 17 14:31:51 2013 +0100
summary:
Merge.
files:
Include/pythonrun.h | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/Include/pythonrun.h b/Include/pythonrun.h
--- a/Include/pythonrun.h
+++ b/Include/pythonrun.h
@@ -28,6 +28,9 @@
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(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 *);
--
Repository URL: http://hg.python.org/cpython
More information about the Python-checkins
mailing list