diff options
| author | Ned Deily <nad@python.org> | 2016-12-16 01:02:17 -0500 |
|---|---|---|
| committer | Ned Deily <nad@python.org> | 2016-12-16 01:02:17 -0500 |
| commit | 572f6e0e2369723d4de78de5a8d1ec7898fb2151 (patch) | |
| tree | 8364bfe6cdd21ede611c9754f050edd15a041e91 /Python/fileutils.c | |
| parent | 7fe23bc479a6274ac9735df774c80e2cdd60768e (diff) | |
| parent | 69075ae56a3b95cedf039371d80fb5ed243c15e2 (diff) | |
| download | cpython-572f6e0e2369723d4de78de5a8d1ec7898fb2151.tar.gz | |
null merge 3.6.0rc1+ head
Diffstat (limited to 'Python/fileutils.c')
| -rw-r--r-- | Python/fileutils.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Python/fileutils.c b/Python/fileutils.c index 6a32c42c80..e84d66e99a 100644 --- a/Python/fileutils.c +++ b/Python/fileutils.c @@ -20,7 +20,7 @@ extern int winerror_to_errno(int); #include <fcntl.h> #endif /* HAVE_FCNTL_H */ -#ifdef __APPLE__ +#if defined(__APPLE__) || defined(__ANDROID__) extern wchar_t* _Py_DecodeUTF8_surrogateescape(const char *s, Py_ssize_t size); #endif @@ -273,7 +273,7 @@ decode_ascii_surrogateescape(const char *arg, size_t *size) wchar_t* Py_DecodeLocale(const char* arg, size_t *size) { -#ifdef __APPLE__ +#if defined(__APPLE__) || defined(__ANDROID__) wchar_t *wstr; wstr = _Py_DecodeUTF8_surrogateescape(arg, strlen(arg)); if (size != NULL) { @@ -406,7 +406,7 @@ oom: if (size != NULL) *size = (size_t)-1; return NULL; -#endif /* __APPLE__ */ +#endif /* __APPLE__ or __ANDROID__ */ } /* Encode a wide character string to the locale encoding with the @@ -424,7 +424,7 @@ oom: char* Py_EncodeLocale(const wchar_t *text, size_t *error_pos) { -#ifdef __APPLE__ +#if defined(__APPLE__) || defined(__ANDROID__) Py_ssize_t len; PyObject *unicode, *bytes = NULL; char *cpath; @@ -522,7 +522,7 @@ Py_EncodeLocale(const wchar_t *text, size_t *error_pos) bytes = result; } return result; -#endif /* __APPLE__ */ +#endif /* __APPLE__ or __ANDROID__ */ } |