From 1d4285a042772c7a31c4e19f8dbcbcf9b2ee3b95 Mon Sep 17 00:00:00 2001 From: "Miss Islington (bot)" <31488909+miss-islington@users.noreply.github.com> Date: Mon, 26 Aug 2019 16:17:56 -0700 Subject: [PATCH] bpo-36763: Make Py_BytesMain() public (GH-15532) Declare Py_BytesMain() in Include/pylifecycle.h, rather in Include/internal/pycore_pylifecycle.h. (cherry picked from commit 9a943b4ce13fac26873b8100e89c818c5c47ac4b) Co-authored-by: Victor Stinner --- Include/internal/pycore_pylifecycle.h | 2 -- Include/pylifecycle.h | 2 ++ 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Include/internal/pycore_pylifecycle.h b/Include/internal/pycore_pylifecycle.h index 51f05b389e3..a21eb014223 100644 --- a/Include/internal/pycore_pylifecycle.h +++ b/Include/internal/pycore_pylifecycle.h @@ -15,8 +15,6 @@ extern "C" { * KeyboardInterrupt exception, suggesting the user pressed ^C. */ PyAPI_DATA(int) _Py_UnhandledKeyboardInterrupt; -PyAPI_FUNC(int) Py_BytesMain(int argc, char **argv); - extern int _Py_SetFileSystemEncoding( const char *encoding, const char *errors); diff --git a/Include/pylifecycle.h b/Include/pylifecycle.h index 1df114a73de..c5368b3c5ed 100644 --- a/Include/pylifecycle.h +++ b/Include/pylifecycle.h @@ -32,6 +32,8 @@ PyAPI_FUNC(void) _Py_NO_RETURN Py_Exit(int); /* Bootstrap __main__ (defined in Modules/main.c) */ PyAPI_FUNC(int) Py_Main(int argc, wchar_t **argv); +PyAPI_FUNC(int) Py_BytesMain(int argc, char **argv); + /* In pathconfig.c */ PyAPI_FUNC(void) Py_SetProgramName(const wchar_t *); PyAPI_FUNC(wchar_t *) Py_GetProgramName(void);