|
@ -1,6 +1,6 @@ |
|
|
diff -u -r /home/fornwall/lib/android-ndk/sources/android/support/include/iconv.h ./include/iconv.h
|
|
|
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 2014-06-03 13:15:33.000000000 -0400
|
|
|
--- /home/fornwall/lib/android-ndk/sources/android/support/include/iconv.h 2016-03-03 16:54:04.000000000 -0500
|
|
|
+++ ./include/iconv.h 2016-01-03 21:17:16.472527767 -0500
|
|
|
+++ ./include/iconv.h 2016-05-25 16:15:29.543192668 -0400
|
|
|
@@ -28,8 +28,6 @@
|
|
|
@@ -28,8 +28,6 @@
|
|
|
#ifndef NDK_ANDROID_SUPPORT_ICONV_H |
|
|
#ifndef NDK_ANDROID_SUPPORT_ICONV_H |
|
|
#define NDK_ANDROID_SUPPORT_ICONV_H |
|
|
#define NDK_ANDROID_SUPPORT_ICONV_H |
|
@ -10,10 +10,15 @@ diff -u -r /home/fornwall/lib/android-ndk/sources/android/support/include/iconv. |
|
|
#ifdef __cplusplus |
|
|
#ifdef __cplusplus |
|
|
extern "C" { |
|
|
extern "C" { |
|
|
#endif |
|
|
#endif |
|
|
@@ -46,6 +44,4 @@
|
|
|
@@ -43,9 +41,7 @@
|
|
|
} // extern "C" |
|
|
int iconv_close(iconv_t); |
|
|
|
|
|
|
|
|
|
|
|
#ifdef __cplusplus |
|
|
|
|
|
-} // extern "C"
|
|
|
|
|
|
+}
|
|
|
#endif |
|
|
#endif |
|
|
|
|
|
|
|
|
-#endif // !__LP64__
|
|
|
-#endif // !__LP64__
|
|
|
-
|
|
|
-
|
|
|
#endif // NDK_ANDROID_SUPPORT_ICONV_H |
|
|
-#endif // NDK_ANDROID_SUPPORT_ICONV_H
|
|
|
|
|
|
+#endif
|
|
|