diff options
| author | Victor Stinner <victor.stinner@gmail.com> | 2017-12-15 22:06:17 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-15 22:06:17 (GMT) |
| commit | d2b02310acbfe6c978a8ad3cd3ac8b3f12927442 (patch) | |
| tree | b0815e4800c123e8205d8308730183625f73f9e6 /Python | |
| parent | 6693d7af6670f8bda331e0b63bb77fce2e3efe9c (diff) | |
| download | cpython-d2b02310acbfe6c978a8ad3cd3ac8b3f12927442.zip cpython-d2b02310acbfe6c978a8ad3cd3ac8b3f12927442.tar.gz cpython-d2b02310acbfe6c978a8ad3cd3ac8b3f12927442.tar.bz2 | |
bpo-29240: Don't define decode_locale() on macOS (#4895)
Don't define decode_locale() nor encode_locale() on macOS or Android.
Diffstat (limited to 'Python')
| -rw-r--r-- | Python/fileutils.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Python/fileutils.c b/Python/fileutils.c index 03cc379..4b69049 100644 --- a/Python/fileutils.c +++ b/Python/fileutils.c @@ -249,6 +249,7 @@ decode_ascii_surrogateescape(const char *arg, size_t *size) } #endif +#if !defined(__APPLE__) && !defined(__ANDROID__) static wchar_t* decode_locale(const char* arg, size_t *size) { @@ -364,6 +365,7 @@ oom: } return NULL; } +#endif /* Decode a byte string from the locale encoding with the @@ -453,6 +455,7 @@ _Py_EncodeLocaleUTF8(const wchar_t *text, size_t *error_pos) return cpath; } +#if !defined(__APPLE__) && !defined(__ANDROID__) static char* encode_locale(const wchar_t *text, size_t *error_pos) { @@ -516,6 +519,7 @@ encode_locale(const wchar_t *text, size_t *error_pos) } return result; } +#endif /* Encode a wide character string to the locale encoding with the surrogateescape error handler: surrogate characters in the range |