Fixed compiler flags in libintl

project/jni/application/simplemixer/AndroidAppSettings.cfg

@@ -30,6 +30,5 @@ CustomBuildScript=n
 AppCflags='-O2 -finline-functions'
 AppLdflags=''
 AppSubdirsBuild=''
-AppUseCrystaXToolchain=n
 AppCmdline=''
 ReadmeText='^'

project/jni/application/src

@@ -1 +1 @@
-ballfield
+ufoai

project/jni/intl/include/libintl.h

@@ -427,13 +427,13 @@ extern int vswprintf (wchar_t *, size_t, const wchar_t *, va_list);
 
 
 /* Support for the locale chosen by the user.  */
-#if (defined __APPLE__ && defined __MACH__) || defined _WIN32 || defined __WIN32__ || defined __CYGWIN__
+#if (defined __APPLE__ && defined __MACH__) || defined _WIN32 || defined __WIN32__ || defined __CYGWIN__ || defined ANDROID
 
 #undef setlocale
 #define setlocale libintl_setlocale
 extern char *setlocale (int, const char *);
 
-#if 1
+#if !defined ANDROID
 
 #undef newlocale
 #define newlocale libintl_newlocale

project/jni/intl/src/config.h

@@ -59,7 +59,7 @@
 
 /* Define to 1 if realpath() can malloc memory, always gives an absolute path,
    and handles trailing slash correctly. */
-/* #undef FUNC_REALPATH_WORKS */
+#define FUNC_REALPATH_WORKS 1
 
 /* Define to a C preprocessor expression that evaluates to 1 or 0, depending
    whether the gnulib module canonicalize-lgpl shall be considered present. */
@@ -784,7 +784,7 @@
 #define HAVE_SETENV 1
 
 /* Define to 1 if you have the `setlocale' function. */
-/* #define HAVE_SETLOCALE 1 */
+#define HAVE_SETLOCALE 1
 
 /* Define to 1 if you have the <signal.h> header file. */
 #define HAVE_SIGNAL_H 1

project/jni/intl/src/libgnuintl.h

@@ -433,13 +433,13 @@ extern LIBINTL_DLL_EXPORTED int vswprintf (wchar_t *, size_t, const wchar_t *, v
 
 
 /* Support for the locale chosen by the user.  */
-#if (defined __APPLE__ && defined __MACH__) || defined _WIN32 || defined __WIN32__ || defined __CYGWIN__
+#if (defined __APPLE__ && defined __MACH__) || defined _WIN32 || defined __WIN32__ || defined __CYGWIN__ || defined ANDROID
 
 #undef setlocale
 #define setlocale libintl_setlocale
 extern LIBINTL_DLL_EXPORTED char *setlocale (int, const char *);
 
-#if 1
+#if !defined ANDROID
 
 #undef newlocale
 #define newlocale libintl_newlocale

project/jni/intl/src/setlocale.c

@@ -44,7 +44,7 @@
 
 #include "gettextP.h"
 
-#if (defined __APPLE__ && defined __MACH__) || defined _WIN32 || defined __WIN32__ || defined __CYGWIN__
+#if (defined __APPLE__ && defined __MACH__) || defined _WIN32 || defined __WIN32__ || defined __CYGWIN__ || defined ANDROID
 
 # undef setlocale
 # undef newlocale