Commit | Line | Data |
---|---|---|
59f0d218 FF |
1 | diff -u -r ../upstream.git/apt-pkg/deb/debrecords.cc ./apt-pkg/deb/debrecords.cc |
2 | --- ../upstream.git/apt-pkg/deb/debrecords.cc 2014-04-25 13:39:00.000000000 +0200 | |
3 | +++ ./apt-pkg/deb/debrecords.cc 2014-07-01 16:47:41.913835586 +0200 | |
4 | @@ -22,7 +22,9 @@ | |
5 | #include <algorithm> | |
6 | #include <string> | |
7 | #include <vector> | |
8 | +#ifndef __ANDROID__ | |
9 | #include <langinfo.h> | |
10 | +#endif | |
11 | /*}}}*/ | |
12 | ||
13 | using std::string; | |
14 | @@ -151,11 +153,13 @@ | |
15 | orig = Section.FindS(string("Description-").append(*l).c_str()); | |
16 | } | |
17 | ||
18 | +#ifndef __ANDROID__ | |
19 | char const * const codeset = nl_langinfo(CODESET); | |
20 | if (strcmp(codeset,"UTF-8") != 0) { | |
21 | UTF8ToCodeset(codeset, orig, &dest); | |
22 | orig = dest; | |
23 | } | |
24 | +#endif | |
25 | ||
26 | return orig; | |
27 | } |