diff options
| author | Xavier de Gaye <xdegaye@users.sourceforge.net> | 2016-12-15 21:01:52 +0100 |
|---|---|---|
| committer | Xavier de Gaye <xdegaye@users.sourceforge.net> | 2016-12-15 21:01:52 +0100 |
| commit | 31eaf49ed93e725ba84e17156b90c785ca8ecb4c (patch) | |
| tree | d4a0f0019b1905a9f703721e6213b0879895762a /Objects/unicodeobject.c | |
| parent | 5cc70c9935ca07d4ac08cddaeee90a87ec1e5a4a (diff) | |
| parent | 76febd079299d64abffee0bdd7c4c1785e5a0fa7 (diff) | |
| download | cpython-git-31eaf49ed93e725ba84e17156b90c785ca8ecb4c.tar.gz | |
Merge 3.6.
Diffstat (limited to 'Objects/unicodeobject.c')
| -rw-r--r-- | Objects/unicodeobject.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c index 7f58129f28..3fdce82ae6 100644 --- a/Objects/unicodeobject.c +++ b/Objects/unicodeobject.c @@ -5067,10 +5067,10 @@ onError: return NULL; } -#ifdef __APPLE__ +#if defined(__APPLE__) || defined(__ANDROID__) /* Simplified UTF-8 decoder using surrogateescape error handler, - used to decode the command line arguments on Mac OS X. + used to decode the command line arguments on Mac OS X and Android. Return a pointer to a newly allocated wide character string (use PyMem_RawFree() to free the memory), or NULL on memory allocation error. */ @@ -5121,7 +5121,7 @@ _Py_DecodeUTF8_surrogateescape(const char *s, Py_ssize_t size) return unicode; } -#endif /* __APPLE__ */ +#endif /* __APPLE__ or __ANDROID__ */ /* Primary internal function which creates utf8 encoded bytes objects. |