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

--- a/m4/stdio_h.m4	Mon Mar 08 02:42:34 2010 +0100
+++ b/m4/stdio_h.m4	Mon Mar 08 02:43:35 2010 +0100
@@ -1,4 +1,4 @@
-# stdio_h.m4 serial 25
+# stdio_h.m4 serial 26
 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,
@@ -45,6 +45,8 @@
   dnl Use AC_REQUIRE here, so that the default settings are expanded once only.
   AC_REQUIRE([gl_STDIO_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_STDIO_H_DEFAULTS],

--- a/modules/stdio-tests	Mon Mar 08 02:42:34 2010 +0100
+++ b/modules/stdio-tests	Mon Mar 08 02:43:35 2010 +0100
@@ -1,11 +1,20 @@
 Files:
 tests/test-stdio.c
+tests/test-stdio-c++.cc
+tests/signature.h
 
 Depends-on:
 verify
+ansi-c++-opt
 
 configure.ac:
 
 Makefile.am:
 TESTS += test-stdio
 check_PROGRAMS += test-stdio
+if ANSICXX
+TESTS += test-stdio-c++
+check_PROGRAMS += test-stdio-c++
+test_stdio_c___SOURCES = test-stdio-c++.cc
+test_stdio_c___LDADD = $(LDADD) $(LIBINTL)
+endif

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/test-stdio-c++.cc	Mon Mar 08 02:43:35 2010 +0100
@@ -0,0 +1,187 @@
+/* Test of <stdio.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 <stdio.h>
+
+#include "signature.h"
+
+
+#if GNULIB_DPRINTF
+SIGNATURE_CHECK (GNULIB_NAMESPACE::dprintf, int, (int, const char *, ...));
+#endif
+
+#if GNULIB_FCLOSE
+SIGNATURE_CHECK (GNULIB_NAMESPACE::fclose, int, (FILE *));
+#endif
+
+#if GNULIB_FFLUSH
+SIGNATURE_CHECK (GNULIB_NAMESPACE::fflush, int, (FILE *));
+#endif
+
+#if GNULIB_FOPEN
+SIGNATURE_CHECK (GNULIB_NAMESPACE::fopen, FILE *,
+                 (const char *, const char *));
+#endif
+
+#if GNULIB_FPRINTF_POSIX || GNULIB_FPRINTF
+SIGNATURE_CHECK (GNULIB_NAMESPACE::fprintf, int, (FILE *, const char *, ...));
+#endif
+
+#if GNULIB_FPURGE
+SIGNATURE_CHECK (GNULIB_NAMESPACE::fpurge, int, (FILE *));
+#endif
+
+#if GNULIB_FPUTC
+SIGNATURE_CHECK (GNULIB_NAMESPACE::fputc, int, (int, FILE *));
+#endif
+
+#if GNULIB_FPUTS
+SIGNATURE_CHECK (GNULIB_NAMESPACE::fputs, int, (const char *, FILE *));
+#endif
+
+#if GNULIB_FREOPEN
+SIGNATURE_CHECK (GNULIB_NAMESPACE::freopen, FILE *,
+                 (const char *, const char *, FILE *));
+#endif
+
+#if GNULIB_FSEEK
+SIGNATURE_CHECK (GNULIB_NAMESPACE::fseek, int, (FILE *, long, int));
+#endif
+
+#if GNULIB_FSEEKO
+SIGNATURE_CHECK (GNULIB_NAMESPACE::fseeko, int, (FILE *, off_t, int));
+#endif
+
+#if GNULIB_FTELL
+SIGNATURE_CHECK (GNULIB_NAMESPACE::ftell, long, (FILE *));
+#endif
+
+#if GNULIB_FTELLO
+SIGNATURE_CHECK (GNULIB_NAMESPACE::ftello, off_t, (FILE *));
+#endif
+
+#if GNULIB_FWRITE
+SIGNATURE_CHECK (GNULIB_NAMESPACE::fwrite, size_t,
+                 (const void *, size_t, size_t, FILE *));
+#endif
+
+#if GNULIB_GETDELIM
+SIGNATURE_CHECK (GNULIB_NAMESPACE::getdelim, ssize_t,
+                 (char **, size_t *, int, FILE *));
+#endif
+
+#if GNULIB_GETLINE
+SIGNATURE_CHECK (GNULIB_NAMESPACE::getline, ssize_t,
+                 (char **, size_t *, FILE *));
+#endif
+
+#if GNULIB_OBSTACK_PRINTF || GNULIB_OBSTACK_PRINTF_POSIX
+SIGNATURE_CHECK (GNULIB_NAMESPACE::obstack_printf, int,
+                 (struct obstack *, const char *, ...));
+SIGNATURE_CHECK (GNULIB_NAMESPACE::obstack_vprintf, int,
+                 (struct obstack *, const char *, va_list));
+#endif
+
+//SIGNATURE_CHECK (GNULIB_NAMESPACE::pclose, int, (FILE *));
+
+#if GNULIB_PERROR
+SIGNATURE_CHECK (GNULIB_NAMESPACE::perror, void, (const char *));
+#endif
+
+#if GNULIB_POPEN
+SIGNATURE_CHECK (GNULIB_NAMESPACE::popen, FILE *,
+                 (const char *, const char *));
+#endif
+
+#if GNULIB_PRINTF_POSIX || GNULIB_PRINTF
+SIGNATURE_CHECK (GNULIB_NAMESPACE::printf, int, (const char *, ...));
+#endif
+
+#if GNULIB_PUTC
+SIGNATURE_CHECK (GNULIB_NAMESPACE::putc, int, (int, FILE *));
+#endif
+
+#if GNULIB_PUTCHAR
+SIGNATURE_CHECK (GNULIB_NAMESPACE::putchar, int, (int));
+#endif
+
+#if GNULIB_PUTS
+SIGNATURE_CHECK (GNULIB_NAMESPACE::puts, int, (const char *));
+#endif
+
+#if GNULIB_REMOVE
+SIGNATURE_CHECK (GNULIB_NAMESPACE::remove, int, (const char *));
+#endif
+
+#if GNULIB_RENAME
+SIGNATURE_CHECK (GNULIB_NAMESPACE::rename, int, (const char *, const char *));
+#endif
+
+#if GNULIB_RENAMEAT
+SIGNATURE_CHECK (GNULIB_NAMESPACE::renameat, int,
+                 (int, char const *, int, char const *));
+#endif
+
+#if GNULIB_SNPRINTF
+SIGNATURE_CHECK (GNULIB_NAMESPACE::snprintf, int,
+                 (char *, size_t, const char *, ...));
+#endif
+
+#if GNULIB_SPRINTF_POSIX
+SIGNATURE_CHECK (GNULIB_NAMESPACE::sprintf, int, (char *, const char *, ...));
+#endif
+
+#if GNULIB_VASPRINTF
+SIGNATURE_CHECK (GNULIB_NAMESPACE::asprintf, int,
+                 (char **, const char *, ...));
+SIGNATURE_CHECK (GNULIB_NAMESPACE::vasprintf, int,
+                 (char **, const char *, va_list));
+#endif
+
+#if GNULIB_VDPRINTF
+SIGNATURE_CHECK (GNULIB_NAMESPACE::vdprintf, int,
+                 (int, const char *, va_list));
+#endif
+
+#if GNULIB_VFPRINTF_POSIX || GNULIB_VFPRINTF
+SIGNATURE_CHECK (GNULIB_NAMESPACE::vfprintf, int,
+                 (FILE *, const char *, va_list));
+#endif
+
+#if GNULIB_VPRINTF_POSIX || GNULIB_VPRINTF
+SIGNATURE_CHECK (GNULIB_NAMESPACE::vprintf, int, (const char *, va_list));
+#endif
+
+#if GNULIB_VSNPRINTF
+SIGNATURE_CHECK (GNULIB_NAMESPACE::vsnprintf, int,
+                 (char *, size_t, const char *, va_list));
+#endif
+
+#if GNULIB_VSPRINTF_POSIX
+SIGNATURE_CHECK (GNULIB_NAMESPACE::vsprintf, int,
+                 (char *, const char *, va_list));
+#endif
+
+
+int
+main ()
+{
+}