From: Bruno Haible Date: Tue, 9 Jul 2019 06:45:16 +0000 (+0200) Subject: striconveh test: Fix a compilation failure when iconv is not available. X-Git-Tag: v1.0~4767 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b417a9c02359cd1e9ed215e0896b36dd383fc47f;p=thirdparty%2Fgnulib.git striconveh test: Fix a compilation failure when iconv is not available. Reported by Tom G. Christensen . * tests/test-striconveh.c (main): Move iconv_close invocations inside HAVE_ICONV. --- diff --git a/ChangeLog b/ChangeLog index 01696987f6..1c9bd5f413 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2019-07-09 Bruno Haible + + striconveh test: Fix a compilation failure when iconv is not available. + Reported by Tom G. Christensen . + * tests/test-striconveh.c (main): Move iconv_close invocations inside + HAVE_ICONV. + 2019-07-07 Akim Demaille argmatch: adjust columns for help2man. diff --git a/tests/test-striconveh.c b/tests/test-striconveh.c index ed41884e78..c2fb8bb40f 100644 --- a/tests/test-striconveh.c +++ b/tests/test-striconveh.c @@ -1106,8 +1106,6 @@ main () free (result); } -#endif - /* -------------------------------- Done. -------------------------------- */ if (cd_ascii_to_88591 != (iconv_t)(-1)) @@ -1116,5 +1114,7 @@ main () if (cd_utf7_to_utf8 != (iconv_t)(-1)) iconv_close (cd_utf7_to_utf8); +#endif + return 0; }