Commit | Line | Data |
---|---|---|
59f0d218 FF |
1 | diff -u -r ../mc-4.8.11/lib/strutil/strutil.c ./lib/strutil/strutil.c |
2 | --- ../mc-4.8.11/lib/strutil/strutil.c 2013-11-29 19:27:07.000000000 +0100 | |
3 | +++ ./lib/strutil/strutil.c 2014-02-07 01:55:53.000000000 +0100 | |
4 | @@ -26,7 +26,9 @@ | |
5 | #include <config.h> | |
6 | ||
7 | #include <stdlib.h> | |
8 | +#ifndef __ANDROID__ | |
9 | #include <langinfo.h> | |
10 | +#endif | |
11 | #include <string.h> | |
12 | #include <errno.h> | |
13 | ||
14 | @@ -306,6 +308,9 @@ | |
15 | const char * | |
16 | str_detect_termencoding (void) | |
17 | { | |
18 | +#ifdef __ANDROID__ | |
19 | + return "utf-8"; | |
20 | +#else | |
21 | if (term_encoding == NULL) | |
22 | { | |
23 | /* On Linux, nl_langinfo (CODESET) returns upper case UTF-8 whether the LANG is set | |
24 | @@ -316,6 +321,7 @@ | |
25 | } | |
26 | ||
27 | return term_encoding; | |
28 | +#endif | |
29 | } | |
30 | ||
31 | static int |