From a9042e00d8afa1e9304412568be26349f85ccd3c Mon Sep 17 00:00:00 2001
From: Bruno Haible <bruno@clisp.org>
Date: Fri, 8 Jul 2011 03:38:33 +0200
Subject: [PATCH] pthread_sigmask: Ensure declaration in <signal.h> also on
 Solaris 2.6.

---
 ChangeLog                                | 4 ++--
 doc/posix-functions/pthread_sigmask.texi | 2 +-
 lib/signal.in.h                          | 6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 865313641..581b066e8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,8 @@
 2011-07-07  Bruno Haible  <bruno@clisp.org>
 
 	pthread_sigmask: Ensure declaration in <signal.h>.
-	* lib/signal.in.h: On MacOS X, FreeBSD, OpenBSD, OSF/1, include
-	<pthread.h>.
+	* lib/signal.in.h: On MacOS X, FreeBSD, OpenBSD, OSF/1, Solaris 2.6,
+	include <pthread.h>.
 	* doc/posix-functions/pthread_sigmask.texi: Mention the header file
 	problem.
 
diff --git a/doc/posix-functions/pthread_sigmask.texi b/doc/posix-functions/pthread_sigmask.texi
index 2f62c1b70..1bd24e599 100644
--- a/doc/posix-functions/pthread_sigmask.texi
+++ b/doc/posix-functions/pthread_sigmask.texi
@@ -14,7 +14,7 @@ Solaris 2.4, mingw, BeOS.
 @item
 This function is declared in @code{<pthread.h>} instead of @code{<signal.h>}
 on some platforms:
-MacOS X 10.3, FreeBSD 6.4, OpenBSD 3.8, OSF/1 4.0.
+MacOS X 10.3, FreeBSD 6.4, OpenBSD 3.8, OSF/1 4.0, Solaris 2.6.
 @end itemize
 
 Portability problems not fixed by Gnulib:
diff --git a/lib/signal.in.h b/lib/signal.in.h
index ea227726e..475727944 100644
--- a/lib/signal.in.h
+++ b/lib/signal.in.h
@@ -55,11 +55,11 @@
 #ifndef _@GUARD_PREFIX@_SIGNAL_H
 #define _@GUARD_PREFIX@_SIGNAL_H
 
-/* MacOS X 10.3, FreeBSD 6.4, OpenBSD 3.8, OSF/1 4.0 declare pthread_sigmask in
-   <pthread.h>, not in <signal.h>.
+/* MacOS X 10.3, FreeBSD 6.4, OpenBSD 3.8, OSF/1 4.0, Solaris 2.6 declare
+   pthread_sigmask in <pthread.h>, not in <signal.h>.
    But avoid namespace pollution on glibc systems.*/
 #if (@GNULIB_PTHREAD_SIGMASK@ || defined GNULIB_POSIXCHECK) \
-    && ((defined __APPLE__ && defined __MACH__) || defined __FreeBSD__ || defined __OpenBSD__ || defined __osf__) \
+    && ((defined __APPLE__ && defined __MACH__) || defined __FreeBSD__ || defined __OpenBSD__ || defined __osf__ || defined __sun) \
     && ! defined __GLIBC__
 # include <pthread.h>
 #endif
-- 
2.11.0