diff -u -r ../gtypist-2.9.4/src/gtypist.c ./src/gtypist.c --- ../gtypist-2.9.4/src/gtypist.c 2013-08-18 16:36:14.000000000 +0200 +++ ./src/gtypist.c 2014-03-01 01:30:43.000000000 +0100 @@ -41,7 +41,7 @@ #include #include #include -#ifndef MINGW +#if !defined(MINGW) && !defined(__ANDROID__) #include #endif @@ -138,7 +138,7 @@ #define ADDCH_REV(X) wideaddch_rev(X) -#ifdef MINGW +#if defined(MINGW) || defined(__ANDROID__) #define MIN( a, b ) ( ( a ) < ( b )? ( a ) : ( b ) ) #define MAX( a, b ) ( ( a ) > ( b )? ( a ) : ( b ) ) #endif @@ -1999,7 +1999,7 @@ textdomain (PACKAGE); #endif -#ifdef MINGW +#if defined(MINGW) || defined(__ANDROID__) locale_encoding = "UTF-8"; #else locale_encoding = nl_langinfo(CODESET);