Skip to content

bpo-29240: Don't define decode_locale() on macOS #4895

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vstinner merged 1 commit into from
Dec 15, 2017
Merged

bpo-29240: Don't define decode_locale() on macOS #4895

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions Python/fileutils.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand Down Expand Up @@ -364,6 +365,7 @@ decode_locale(const char* arg, size_t *size)
}
return NULL;
}
#endif


/* Decode a byte string from the locale encoding with the
Expand Down Expand Up @@ -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)
{
Expand Down Expand Up @@ -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
Expand Down