From: Bruno Haible <bruno@clisp.org>
Date: Sun, 10 May 2026 15:04:19 +0000 (+0200)
Subject: signal.h: Fix compilation error on Solaris 10 in C++ mode.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bebdf0f060b472d13a11b95aeb5997bef44118bd;p=thirdparty%2Fgnulib.git

signal.h: Fix compilation error on Solaris 10 in C++ mode.

* lib/signal.in.h: On Solaris in C++ mode, don't include <pthread.h>.
The include <pthread.h> is only needed for Solaris versions < 9.
---

diff --git a/ChangeLog b/ChangeLog
index 0e96accffa..0187be4148 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2026-05-10  Bruno Haible  <bruno@clisp.org>
+
+	signal.h: Fix compilation error on Solaris 10 in C++ mode.
+	* lib/signal.in.h: On Solaris in C++ mode, don't include <pthread.h>.
+	The include <pthread.h> is only needed for Solaris versions < 9.
+
 2026-05-10  Bruno Haible  <bruno@clisp.org>
 
 	sys_wait-h: Fix compilation error on Solaris 10 in C++ mode.
diff --git a/lib/signal.in.h b/lib/signal.in.h
index e4fa3fbaf2..9e140ca5e8 100644
--- a/lib/signal.in.h
+++ b/lib/signal.in.h
@@ -74,12 +74,13 @@
 
 /* Mac OS X 10.3, FreeBSD < 8.0, OpenBSD < 5.1, Solaris 2.6, Android,
    OS/2 kLIBC declare pthread_sigmask in <pthread.h>, not in <signal.h>.
-   But avoid namespace pollution on glibc systems.*/
+   But avoid namespace pollution on glibc systems.  */
 #if (@GNULIB_PTHREAD_SIGMASK@ || defined GNULIB_POSIXCHECK) \
     && ((defined __APPLE__ && defined __MACH__) \
         || (defined __FreeBSD__ && __FreeBSD__ < 8) \
         || (defined __OpenBSD__ && OpenBSD < 201205) \
-        || defined __sun || defined __ANDROID__ \
+        || (defined __sun && !defined __cplusplus) \
+        || defined __ANDROID__ \
         || defined __KLIBC__) \
     && ! defined __GLIBC__
 # include <pthread.h>