--- a/ChangeLog	Mon Mar 08 02:57:33 2010 +0100
+++ b/ChangeLog	Mon Mar 08 02:59:04 2010 +0100
@@ -1,5 +1,13 @@
 2010-03-07  Bruno Haible  <bruno@clisp.org>
 
+	Tests of module 'wchar' in C++ mode.
+	* tests/test-wchar-c++.cc: New file.
+	* modules/wchar-tests (Files): Add it and tests/signature.h.
+	(Depends-on): Add ansi-c++-opt.
+	(Makefile.am): Arrange to compile and run test-wchar-c++.
+	* m4/wchar_h.m4 (gl_WCHAR_MODULE_INDICATOR): Invoke
+	gl_MODULE_INDICATOR.
+
 	Tests of module 'unistd' in C++ mode.
 	* tests/test-unistd-c++.cc: New file.
 	* modules/unistd-tests (Files): Add it and tests/signature.h.

--- a/m4/wchar_h.m4	Mon Mar 08 02:57:33 2010 +0100
+++ b/m4/wchar_h.m4	Mon Mar 08 02:59:04 2010 +0100
@@ -7,7 +7,7 @@
 
 dnl Written by Eric Blake.
 
-# wchar_h.m4 serial 31
+# wchar_h.m4 serial 32
 
 AC_DEFUN([gl_WCHAR_H],
 [
@@ -108,6 +108,8 @@
   dnl Use AC_REQUIRE here, so that the default settings are expanded once only.
   AC_REQUIRE([gl_WCHAR_H_DEFAULTS])
   GNULIB_[]m4_translit([$1],[abcdefghijklmnopqrstuvwxyz./-],[ABCDEFGHIJKLMNOPQRSTUVWXYZ___])=1
+  dnl Define it also as a C macro, for the benefit of the unit tests.
+  gl_MODULE_INDICATOR([$1])
 ])
 
 AC_DEFUN([gl_WCHAR_H_DEFAULTS],

--- a/modules/wchar-tests	Mon Mar 08 02:57:33 2010 +0100
+++ b/modules/wchar-tests	Mon Mar 08 02:59:04 2010 +0100
@@ -1,11 +1,20 @@
 Files:
 tests/test-wchar.c
+tests/test-wchar-c++.cc
+tests/signature.h
 
 Depends-on:
 verify
+ansi-c++-opt
 
 configure.ac:
 
 Makefile.am:
 TESTS += test-wchar
 check_PROGRAMS += test-wchar
+if ANSICXX
+TESTS += test-wchar-c++
+check_PROGRAMS += test-wchar-c++
+test_wchar_c___SOURCES = test-wchar-c++.cc
+test_wchar_c___LDADD = $(LDADD) $(LIBINTL)
+endif

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/test-wchar-c++.cc	Mon Mar 08 02:59:04 2010 +0100
@@ -0,0 +1,82 @@
+/* Test of <wchar.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>
+
+#include <wchar.h>
+
+#include "signature.h"
+
+
+#if GNULIB_BTOWC
+SIGNATURE_CHECK (GNULIB_NAMESPACE::btowc, wint_t, (int));
+#endif
+
+#if GNULIB_WCTOB
+SIGNATURE_CHECK (GNULIB_NAMESPACE::wctob, int, (wint_t));
+#endif
+
+#if GNULIB_MBSINIT
+SIGNATURE_CHECK (GNULIB_NAMESPACE::mbsinit, int, (const mbstate_t *));
+#endif
+
+#if GNULIB_MBRTOWC
+SIGNATURE_CHECK (GNULIB_NAMESPACE::mbrtowc, size_t,
+                 (wchar_t *, const char *, size_t, mbstate_t *));
+#endif
+
+#if GNULIB_MBRLEN
+SIGNATURE_CHECK (GNULIB_NAMESPACE::mbrlen, size_t,
+                 (const char *, size_t, mbstate_t *));
+#endif
+
+#if GNULIB_MBSRTOWCS
+SIGNATURE_CHECK (GNULIB_NAMESPACE::mbsrtowcs, size_t,
+                 (wchar_t *, const char **, size_t, mbstate_t *));
+#endif
+
+#if GNULIB_MBSNRTOWCS
+SIGNATURE_CHECK (GNULIB_NAMESPACE::mbsnrtowcs, size_t,
+                 (wchar_t *, const char **, size_t, size_t, mbstate_t *));
+#endif
+
+#if GNULIB_WCRTOMB
+SIGNATURE_CHECK (GNULIB_NAMESPACE::wcrtomb, size_t,
+                 (char *, wchar_t, mbstate_t *));
+#endif
+
+#if GNULIB_WCSRTOMBS
+SIGNATURE_CHECK (GNULIB_NAMESPACE::wcsrtombs, size_t,
+                 (char *, const wchar_t **, size_t, mbstate_t *));
+#endif
+
+#if GNULIB_WCSNRTOMBS
+SIGNATURE_CHECK (GNULIB_NAMESPACE::wcsnrtombs, size_t,
+                 (char *, const wchar_t **, size_t, size_t, mbstate_t *));
+#endif
+
+#if GNULIB_WCWIDTH
+SIGNATURE_CHECK (GNULIB_NAMESPACE::wcwidth, int, (wchar_t));
+#endif
+
+
+int
+main ()
+{
+}