From: Victor Stinner <victor.stinner@gmail.com>
Date: Fri, 15 Dec 2017 22:06:17 +0000 (+0100)
Subject: bpo-29240: Don't define decode_locale() on macOS (#4895)
X-Git-Tag: v3.7.0a4~120
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d2b02310acbfe6c978a8ad3cd3ac8b3f12927442;p=python

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

Don't define decode_locale() nor encode_locale() on macOS or Android.
---

diff --git a/Python/fileutils.c b/Python/fileutils.c
index 03cc37958a..4b69049ce5 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