From 39f5d71fe464969d5b7000dcff091f6debaf1593 Mon Sep 17 00:00:00 2001 From: waddlesplash Date: Sat, 19 May 2018 20:35:33 -0400 Subject: [PATCH] iconv: Fix the build on GCC6+. Patch from http://git.savannah.gnu.org/gitweb/?p=libiconv.git;a=commit;h=b29089d8b43abc8fba073da7e6dccaeba56b2b70 to fix an "undefined reference" error to that function (https://savannah.gnu.org/bugs/?47953). --- src/libs/iconv/iconv.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/libs/iconv/iconv.c b/src/libs/iconv/iconv.c index 9d522051a8..9ed22c8f5f 100644 --- a/src/libs/iconv/iconv.c +++ b/src/libs/iconv/iconv.c @@ -162,8 +162,12 @@ static const struct alias sysdep_aliases[] = { }; #if defined(__GNUC__) && !defined(DEBUG) __inline +#else +#ifdef __cplusplus +inline #endif -const struct alias * +#endif +static const struct alias * aliases2_lookup (register const char *str) { const struct alias * ptr;