Commit | Line | Data |
---|---|---|
59f0d218 FF |
1 | diff -u -r ../gtypist-2.9.4/src/gtypist.c ./src/gtypist.c |
2 | --- ../gtypist-2.9.4/src/gtypist.c 2013-08-18 16:36:14.000000000 +0200 | |
3 | +++ ./src/gtypist.c 2014-03-01 01:30:43.000000000 +0100 | |
4 | @@ -31,7 +31,7 @@ | |
5 | #ifdef HAVE_PDCURSES | |
6 | #include <curses.h> | |
7 | #else | |
8 | -#include <ncursesw/ncurses.h> | |
9 | +#include <ncurses.h> | |
10 | #endif | |
11 | ||
12 | #include <time.h> | |
13 | @@ -41,7 +41,7 @@ | |
14 | #include <assert.h> | |
15 | #include <locale.h> | |
16 | #include <wctype.h> | |
17 | -#ifndef MINGW | |
18 | +#if !defined(MINGW) && !defined(__ANDROID__) | |
19 | #include <langinfo.h> | |
20 | #endif | |
21 | ||
22 | @@ -138,7 +138,7 @@ | |
23 | #define ADDCH_REV(X) wideaddch_rev(X) | |
24 | ||
25 | ||
26 | -#ifdef MINGW | |
27 | +#if defined(MINGW) || defined(__ANDROID__) | |
28 | #define MIN( a, b ) ( ( a ) < ( b )? ( a ) : ( b ) ) | |
29 | #define MAX( a, b ) ( ( a ) > ( b )? ( a ) : ( b ) ) | |
30 | #endif | |
31 | @@ -1999,7 +1999,7 @@ | |
32 | textdomain (PACKAGE); | |
33 | #endif | |
34 | ||
35 | -#ifdef MINGW | |
36 | +#if defined(MINGW) || defined(__ANDROID__) | |
37 | locale_encoding = "UTF-8"; | |
38 | #else | |
39 | locale_encoding = nl_langinfo(CODESET); |