summaryrefslogtreecommitdiff
path: root/build/android/patches
diff options
context:
space:
mode:
Diffstat (limited to 'build/android/patches')
-rw-r--r--build/android/patches/libiconv_android.patch39
-rw-r--r--build/android/patches/libiconv_stdio.patch13
2 files changed, 0 insertions, 52 deletions
diff --git a/build/android/patches/libiconv_android.patch b/build/android/patches/libiconv_android.patch
deleted file mode 100644
index 4eca0a4ef..000000000
--- a/build/android/patches/libiconv_android.patch
+++ /dev/null
@@ -1,39 +0,0 @@
---- a/libcharset/lib/localcharset.c 2015-06-10 11:55:25.933870724 +0200
-+++ b/libcharset/lib/localcharset.c 2015-06-10 11:55:39.578063493 +0200
-@@ -47,7 +47,7 @@
-
- #if !defined WIN32_NATIVE
- # include <unistd.h>
--# if HAVE_LANGINFO_CODESET
-+# if HAVE_LANGINFO_CODESET && !(defined __ANDROID__)
- # include <langinfo.h>
- # else
- # if 0 /* see comment below */
-@@ -124,7 +124,7 @@ get_charset_aliases (void)
- cp = charset_aliases;
- if (cp == NULL)
- {
--#if !(defined DARWIN7 || defined VMS || defined WIN32_NATIVE || defined __CYGWIN__)
-+#if !(defined DARWIN7 || defined VMS || defined WIN32_NATIVE || defined __CYGWIN__ || defined __ANDROID__)
- const char *dir;
- const char *base = "charset.alias";
- char *file_name;
-@@ -338,6 +338,9 @@ get_charset_aliases (void)
- "CP54936" "\0" "GB18030" "\0"
- "CP65001" "\0" "UTF-8" "\0";
- # endif
-+# if defined __ANDROID__
-+ cp = "*" "\0" "UTF-8" "\0";
-+# endif
- #endif
-
- charset_aliases = cp;
-@@ -361,7 +364,7 @@ locale_charset (void)
- const char *codeset;
- const char *aliases;
-
--#if !(defined WIN32_NATIVE || defined OS2)
-+#if !(defined WIN32_NATIVE || defined OS2 || defined __ANDROID__)
-
- # if HAVE_LANGINFO_CODESET
-
diff --git a/build/android/patches/libiconv_stdio.patch b/build/android/patches/libiconv_stdio.patch
deleted file mode 100644
index 9fa50f79a..000000000
--- a/build/android/patches/libiconv_stdio.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/srclib/stdio.in.h 2011-08-07 15:42:06.000000000 +0200
-+++ b/srclib/stdio.in.h 2015-06-10 09:27:58.129056262 +0200
-@@ -695,8 +696,9 @@ _GL_CXXALIASWARN (gets);
- /* It is very rare that the developer ever has full control of stdin,
- so any use of gets warrants an unconditional warning. Assume it is
- always declared, since it is required by C89. */
--_GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
-+/*_GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");*/
-+#define gets(a) fgets( a, sizeof(*(a)), stdin)
- #endif
-
-
-#if @GNULIB_OBSTACK_PRINTF@ || @GNULIB_OBSTACK_PRINTF_POSIX@