Commit | Line | Data |
---|---|---|
59f0d218 FF |
1 | setlocale(3) returns NULL and does nothing on Android, no point in giving error message. |
2 | ||
3 | diff -u -r ../subversion-1.8.5/subversion/libsvn_subr/cmdline.c ./subversion/libsvn_subr/cmdline.c | |
4 | --- ../subversion-1.8.5/subversion/libsvn_subr/cmdline.c 2013-10-10 06:02:04.000000000 +0200 | |
5 | +++ ./subversion/libsvn_subr/cmdline.c 2014-02-12 09:30:54.000000000 +0100 | |
6 | @@ -162,6 +162,7 @@ | |
7 | /* C programs default to the "C" locale. But because svn is supposed | |
8 | to be i18n-aware, it should inherit the default locale of its | |
9 | environment. */ | |
10 | +#ifndef __ANDROID__ | |
11 | if (!setlocale(LC_ALL, "") | |
12 | && !setlocale(LC_CTYPE, "")) | |
13 | { | |
14 | @@ -191,6 +192,7 @@ | |
15 | progname, progname, *env_var, env_val, progname); | |
16 | } | |
17 | } | |
18 | +#endif | |
19 | ||
20 | /* Initialize the APR subsystem, and register an atexit() function | |
21 | to Uninitialize that subsystem at program exit. */ |