Browse Source
The docker image has been updated, use ./scripts/update-docker.sh to update. Note that we are still using the old deprecated non-unified headers - updating to that is the next step.android-5
Fredrik Fornwall
8 years ago
7 changed files with 11 additions and 127 deletions
@ -1,24 +0,0 @@ |
|||
diff -u -r /home/fornwall/lib/android-ndk/sources/android/support/include/iconv.h ./include/iconv.h
|
|||
--- /home/fornwall/lib/android-ndk/sources/android/support/include/iconv.h 2016-03-03 16:54:04.000000000 -0500
|
|||
+++ ./include/iconv.h 2016-05-25 16:15:29.543192668 -0400
|
|||
@@ -28,8 +28,6 @@
|
|||
#ifndef NDK_ANDROID_SUPPORT_ICONV_H |
|||
#define NDK_ANDROID_SUPPORT_ICONV_H |
|||
|
|||
-#if !defined(__LP64__)
|
|||
-
|
|||
#ifdef __cplusplus |
|||
extern "C" { |
|||
#endif |
|||
@@ -43,9 +41,7 @@
|
|||
int iconv_close(iconv_t); |
|||
|
|||
#ifdef __cplusplus |
|||
-} // extern "C"
|
|||
+}
|
|||
#endif |
|||
|
|||
-#endif // !__LP64__
|
|||
-
|
|||
-#endif // NDK_ANDROID_SUPPORT_ICONV_H
|
|||
+#endif
|
|||
@ -1,11 +0,0 @@ |
|||
diff -u -r /home/fornwall/lib/android-ndk/sources/android/support/include/wchar.h ./include/wchar.h
|
|||
--- /home/fornwall/lib/android-ndk/sources/android/support/include/wchar.h 2014-08-03 23:06:22.000000000 -0400
|
|||
+++ ./include/wchar.h 2015-07-13 03:18:31.440649551 -0400
|
|||
@@ -119,6 +119,7 @@
|
|||
wchar_t *wcstok (wchar_t *__restrict__, const wchar_t *__restrict__, wchar_t **__restrict__); |
|||
|
|||
size_t wcslen (const wchar_t *); |
|||
+size_t wcslcpy(wchar_t *dst, const wchar_t *src, size_t siz);
|
|||
|
|||
wchar_t *wcsstr (const wchar_t *__restrict__, const wchar_t *__restrict__); |
|||
wchar_t *wcswcs (const wchar_t *, const wchar_t *); |
|||
@ -1,27 +0,0 @@ |
|||
Include <xlocale.h> from langinfo.h so that locale_t gets defined. |
|||
|
|||
Include <locale.h> from langinfo.h so that LC_ALL gets defined. |
|||
|
|||
diff -u -r /home/fornwall/lib/android-ndk/sources/android/support/include/langinfo.h ./include/langinfo.h
|
|||
--- /home/fornwall/lib/android-ndk/sources/android/support/include/langinfo.h 2016-03-03 16:54:04.000000000 -0500
|
|||
+++ ./include/langinfo.h 2016-03-12 17:23:01.187197445 -0500
|
|||
@@ -31,6 +31,8 @@
|
|||
// __LP64__ |
|||
|
|||
#include <nl_types.h> |
|||
+#include <xlocale.h>
|
|||
+#include <locale.h>
|
|||
|
|||
#define _NL_ITEM(category,index) (((category) << 10) | (index)) |
|||
|
|||
@@ -111,10 +112,8 @@
|
|||
extern "C" { |
|||
#endif |
|||
|
|||
-#if !defined(__LP64__)
|
|||
char *nl_langinfo(nl_item); |
|||
char *nl_langinfo_l(nl_item, locale_t); |
|||
-#endif // !__LP64__
|
|||
|
|||
#ifdef __cplusplus |
|||
} // extern "C" |
|||
@ -1,43 +0,0 @@ |
|||
diff -N -u -r /home/fornwall/lib/android-ndk/sources/android/support/include/libintl.h ./include/libintl.h
|
|||
--- /home/fornwall/lib/android-ndk/sources/android/support/include/libintl.h 1969-12-31 19:00:00.000000000 -0500
|
|||
+++ ./include/libintl.h 2014-11-27 10:50:18.306215538 -0500
|
|||
@@ -0,0 +1,39 @@
|
|||
+#ifndef NDK_ANDROID_SUPPORT_LIBINTL_H
|
|||
+#define NDK_ANDROID_SUPPORT_LIBINTL_H
|
|||
+
|
|||
+#ifdef __cplusplus
|
|||
+extern "C" {
|
|||
+#endif
|
|||
+
|
|||
+/* Look up MSGID in the current default message catalog for the current LC_MESSAGES locale. If not found, returns MSGID itself (the default text). */
|
|||
+char *gettext (const char *__msgid);
|
|||
+
|
|||
+/* Look up MSGID in the DOMAINNAME message catalog for the current LC_MESSAGES locale. */
|
|||
+char *dgettext (const char *__domainname, const char *__msgid);
|
|||
+
|
|||
+/* Look up MSGID in the DOMAINNAME message catalog for the current CATEGORY locale. */
|
|||
+char *dcgettext (const char *__domainname, const char *__msgid, int __category);
|
|||
+
|
|||
+/* Similar to `gettext' but select the plural form corresponding to the number N. */
|
|||
+char *ngettext (const char *__msgid1, const char *__msgid2, unsigned long int __n);
|
|||
+
|
|||
+/* Similar to `dgettext' but select the plural form corresponding to the number N. */
|
|||
+char *dngettext (const char *__domainname, const char *__msgid1, const char *__msgid2, unsigned long int __n);
|
|||
+
|
|||
+/* Similar to `dcgettext' but select the plural form corresponding to the number N. */
|
|||
+char *dcngettext (const char *__domainname, const char *__msgid1, const char *__msgid2, unsigned long int __n, int __category);
|
|||
+
|
|||
+/* Set the current default message catalog to DOMAINNAME. If DOMAINNAME is null, return the current default. If DOMAINNAME is "", reset to the default of "messages". */
|
|||
+char *textdomain (const char *__domainname);
|
|||
+
|
|||
+/* Specify that the DOMAINNAME message catalog will be found in DIRNAME rather than in the system locale data base. */
|
|||
+char *bindtextdomain (const char *__domainname, const char *__dirname);
|
|||
+
|
|||
+/* Specify the character encoding in which the messages from the DOMAINNAME message catalog will be returned. */
|
|||
+char *bind_textdomain_codeset (const char *__domainname, const char *__codeset);
|
|||
+
|
|||
+#ifdef __cplusplus
|
|||
+}
|
|||
+#endif
|
|||
+
|
|||
+#endif // NDK_ANDROID_SUPPORT_LIBINTL_H
|
|||
Loading…
Reference in new issue