Commit | Line | Data |
---|---|---|
59f0d218 FF |
1 | diff -u -r ../upstream.git/apt-private/private-output.cc ./apt-private/private-output.cc |
2 | --- ../upstream.git/apt-private/private-output.cc 2014-06-10 15:24:50.000000000 +0200 | |
3 | +++ ./apt-private/private-output.cc 2014-06-15 02:40:10.539223656 +0200 | |
4 | @@ -20,7 +20,11 @@ | |
5 | #include <string.h> | |
6 | #include <iomanip> | |
7 | #include <iostream> | |
8 | -#include <langinfo.h> | |
9 | +#ifdef __ANDROID__ | |
10 | +# include <termios.h> | |
11 | +# else | |
12 | +# include <langinfo.h> | |
13 | +#endif | |
14 | #include <unistd.h> | |
15 | #include <signal.h> | |
16 | #include <sys/ioctl.h> | |
17 | @@ -764,7 +768,7 @@ | |
18 | regex_t Pattern; | |
19 | int Res; | |
20 | ||
21 | - Res = regcomp(&Pattern, nl_langinfo(YESEXPR), | |
22 | + Res = regcomp(&Pattern, "^[yY]", | |
23 | REG_EXTENDED|REG_ICASE|REG_NOSUB); | |
24 | ||
25 | if (Res != 0) { |