--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2010-03-07  Bruno Haible  <bruno@clisp.org>
 
+	Tests of module 'iconv-h' in C++ mode.
+	* tests/test-iconv-h-c++.cc: New file.
+	* modules/iconv-h-tests (Files): Add it and tests/signature.h.
+	(Depends-on): Add ansi-c++-opt.
+	(Makefile.am): Arrange to compile and run test-iconv-h-c++.
+
 	Tests of module 'glob' in C++ mode.
 	* tests/test-glob-c++.cc: New file.
 	* modules/glob-tests (Files): Add it.

--- a/modules/iconv-h-tests
+++ b/modules/iconv-h-tests
@@ -1,10 +1,19 @@
 Files:
 tests/test-iconv-h.c
+tests/test-iconv-h-c++.cc
+tests/signature.h
 
 Depends-on:
+ansi-c++-opt
 
 configure.ac:
 
 Makefile.am:
 TESTS += test-iconv-h
 check_PROGRAMS += test-iconv-h
+if ANSICXX
+TESTS += test-iconv-h-c++
+check_PROGRAMS += test-iconv-h-c++
+test_iconv_h_c___SOURCES = test-iconv-h-c++.cc
+test_iconv_h_c___LDADD = $(LDADD) $(LIBINTL) $(LIBICONV)
+endif

new file mode 100644
--- /dev/null
+++ b/tests/test-iconv-h-c++.cc
@@ -0,0 +1,46 @@
+/* Test of <iconv.h> substitute in C++ mode.
+   Copyright (C) 2010 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+/* Written by Bruno Haible <bruno@clisp.org>, 2010.  */
+
+#define GNULIB_NAMESPACE gnulib
+#include <config.h>
+
+#if HAVE_ICONV
+# include <iconv.h>
+
+# ifndef ICONV_CONST
+#  define ICONV_CONST /* empty */
+# endif
+
+# include "signature.h"
+
+
+SIGNATURE_CHECK (GNULIB_NAMESPACE::iconv_open, iconv_t,
+                 (const char *, const char *));
+
+SIGNATURE_CHECK (GNULIB_NAMESPACE::iconv, size_t,
+                 (iconv_t, ICONV_CONST char **, size_t *, char **, size_t *));
+
+SIGNATURE_CHECK (GNULIB_NAMESPACE::iconv_close, int, (iconv_t));
+
+#endif
+
+
+int
+main ()
+{
+}