diff options
| author | Max Bachmann <oss@maxbachmann.de> | 2023-03-09 21:09:12 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-03-09 21:09:12 (GMT) |
| commit | c6858d1e7f4cd3184d5ddea4025ad5dfc7596546 (patch) | |
| tree | 6c5261397eca871567bb29b31cfe02c92f6d3b58 /Parser | |
| parent | ca066bdbed85094a9c4d9930823ce3587807db48 (diff) | |
| download | cpython-c6858d1e7f4cd3184d5ddea4025ad5dfc7596546.zip cpython-c6858d1e7f4cd3184d5ddea4025ad5dfc7596546.tar.gz cpython-c6858d1e7f4cd3184d5ddea4025ad5dfc7596546.tar.bz2 | |
gh-102255: Improve build support for Windows API partitions (GH-102256)
Add `MS_WINDOWS_DESKTOP`, `MS_WINDOWS_APPS`, `MS_WINDOWS_SYSTEM` and `MS_WINDOWS_GAMES` preprocessor definitions to allow switching off functionality missing from particular API partitions ("partitions" are used in Windows to identify overlapping subsets of APIs).
CPython only officially supports `MS_WINDOWS_DESKTOP` and `MS_WINDOWS_SYSTEM` (APPS is included by normal desktop builds, but APPS without DESKTOP is not covered). Other configurations are a convenience for people building their own runtimes.
`MS_WINDOWS_GAMES` is for the Xbox subset of the Windows API, which is also available on client OS, but is restricted compared to `MS_WINDOWS_DESKTOP`. These restrictions may change over time, as they relate to the build headers rather than the OS support, and so we assume that Xbox builds will use the latest available version of the GDK.
Diffstat (limited to 'Parser')
| -rw-r--r-- | Parser/myreadline.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/Parser/myreadline.c b/Parser/myreadline.c index d55fcef..3f0e29f 100644 --- a/Parser/myreadline.c +++ b/Parser/myreadline.c @@ -13,7 +13,9 @@ #include "pycore_fileutils.h" // _Py_BEGIN_SUPPRESS_IPH #include "pycore_pystate.h" // _PyThreadState_GET() #ifdef MS_WINDOWS +# ifndef WIN32_LEAN_AND_MEAN # define WIN32_LEAN_AND_MEAN +# endif # include "windows.h" #endif /* MS_WINDOWS */ @@ -108,7 +110,7 @@ my_fgets(PyThreadState* tstate, char *buf, int len, FILE *fp) /* NOTREACHED */ } -#ifdef MS_WINDOWS +#ifdef HAVE_WINDOWS_CONSOLE_IO /* Readline implementation using ReadConsoleW */ extern char _get_console_type(HANDLE handle); @@ -233,7 +235,7 @@ exit: return buf; } -#endif +#endif /* HAVE_WINDOWS_CONSOLE_IO */ /* Readline implementation using fgets() */ @@ -246,7 +248,7 @@ PyOS_StdioReadline(FILE *sys_stdin, FILE *sys_stdout, const char *prompt) PyThreadState *tstate = _PyOS_ReadlineTState; assert(tstate != NULL); -#ifdef MS_WINDOWS +#ifdef HAVE_WINDOWS_CONSOLE_IO const PyConfig *config = _PyInterpreterState_GetConfig(tstate->interp); if (!config->legacy_windows_stdio && sys_stdin == stdin) { HANDLE hStdIn, hStdErr; |