--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,10 @@
 2010-09-28  Bruno Haible  <bruno@clisp.org>
 
 	Tests for module 'poll-h'.
+	* modules/poll-h-c++-tests: New file.
+	* tests/test-poll-h-c++.cc: New file.
+
+	Tests for module 'poll-h'.
 	* modules/poll-h-tests: New file.
 	* tests/test-poll-h.c: New file.
 

new file mode 100644
--- /dev/null
+++ b/modules/poll-h-c++-tests
@@ -0,0 +1,19 @@
+Files:
+tests/test-poll-h-c++.cc
+tests/signature.h
+
+Status:
+c++-test
+
+Depends-on:
+ansi-c++-opt
+
+configure.ac:
+
+Makefile.am:
+if ANSICXX
+TESTS += test-poll-h-c++
+check_PROGRAMS += test-poll-h-c++
+test_poll_h_c___SOURCES = test-poll-h-c++.cc
+test_poll_h_c___LDADD = $(LDADD) @LIBSOCKET@
+endif

new file mode 100644
--- /dev/null
+++ b/tests/test-poll-h-c++.cc
@@ -0,0 +1,35 @@
+/* Test of <poll.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 <poll.h>
+
+#include "signature.h"
+
+
+#if GNULIB_TEST_POLL
+SIGNATURE_CHECK (GNULIB_NAMESPACE::poll, int, (struct pollfd *, nfds_t, int));
+#endif
+
+
+int
+main ()
+{
+}