| 1 | diff -u -r ../fish-2.6.0/src/wutil.cpp ./src/wutil.cpp |
| 2 | --- ../fish-2.6.0/src/wutil.cpp 2017-06-03 14:45:13.000000000 +0200 |
| 3 | +++ ./src/wutil.cpp 2017-07-13 22:31:47.791569324 +0200 |
| 4 | @@ -290,7 +290,7 @@ |
| 5 | // have to grub through sys_nerr and sys_errlist directly On GNU toolchain, this will produce a |
| 6 | // deprecation warning from the linker (!!), which appears impossible to suppress! |
| 7 | const char *safe_strerror(int err) { |
| 8 | -#if defined(__UCLIBC__) |
| 9 | +#if defined(__UCLIBC__) || defined(__ANDROID__) |
| 10 | // uClibc does not have sys_errlist, however, its strerror is believed to be async-safe. |
| 11 | // See issue #808. |
| 12 | return strerror(err); |