From 2c0203760fed22be4495f7df719462ae76511c6d Mon Sep 17 00:00:00 2001 From: Fredrik Fornwall Date: Wed, 25 May 2016 16:19:13 -0400 Subject: [PATCH] libandroid-support: Remove C++-style comments --- packages/libandroid-support/iconv.h.patch | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/packages/libandroid-support/iconv.h.patch b/packages/libandroid-support/iconv.h.patch index a709ee38..f9bc5626 100644 --- a/packages/libandroid-support/iconv.h.patch +++ b/packages/libandroid-support/iconv.h.patch @@ -1,6 +1,6 @@ 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 -+++ ./include/iconv.h 2016-01-03 21:17:16.472527767 -0500 +--- /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 @@ -10,10 +10,15 @@ diff -u -r /home/fornwall/lib/android-ndk/sources/android/support/include/iconv. #ifdef __cplusplus extern "C" { #endif -@@ -46,6 +44,4 @@ - } // extern "C" +@@ -43,9 +41,7 @@ + int iconv_close(iconv_t); + + #ifdef __cplusplus +-} // extern "C" ++} #endif -#endif // !__LP64__ - - #endif // NDK_ANDROID_SUPPORT_ICONV_H +-#endif // NDK_ANDROID_SUPPORT_ICONV_H ++#endif -- 2.11.0