From d534aa814510c8cd4ac70ffee3e0abd58daba356 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Mon, 20 Dec 2010 00:19:57 +0100 Subject: [PATCH] iconv_open: Fix regression from 2010-12-04. * m4/iconv_open.m4 (gl_FUNC_ICONV_OPEN_UTF): Fix typo. Reported by Noah Lavine . --- ChangeLog | 6 ++++++ m4/iconv_open.m4 | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3d35faa2e..866f5953d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,11 @@ 2010-12-19 Bruno Haible + iconv_open: Fix regression from 2010-12-04. + * m4/iconv_open.m4 (gl_FUNC_ICONV_OPEN_UTF): Fix typo. + Reported by Noah Lavine . + +2010-12-19 Bruno Haible + stdbool test: Avoid a gcc warning. * tests/test-stdbool.c (main): Fail if e1 is false. Reported by Jim Meyering. diff --git a/m4/iconv_open.m4 b/m4/iconv_open.m4 index da9b1fd7e..f0ec5da57 100644 --- a/m4/iconv_open.m4 +++ b/m4/iconv_open.m4 @@ -1,4 +1,4 @@ -# iconv_open.m4 serial 11 +# iconv_open.m4 serial 12 dnl Copyright (C) 2007-2010 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -203,7 +203,7 @@ int main () result |= 8; else if (!(memcmp (buf, expected, sizeof (expected) - 1) == 0)) result |= 8; - else if ((iconv_close (cd) == 0)) + else if (!(iconv_close (cd) == 0)) result |= 8; } } -- 2.11.0