Mercurial > hg > octave-nkf > gnulib-hg
changeset 15369:ff0056fd6295
pthread_sigmask: Ensure declaration in <signal.h> also on Solaris 2.6.
| author | Bruno Haible <bruno@clisp.org> |
|---|---|
| date | Fri, 08 Jul 2011 03:38:33 +0200 |
| parents | 6f48a9a9a38e |
| children | 54bbcd9bb255 |
| files | ChangeLog doc/posix-functions/pthread_sigmask.texi lib/signal.in.h |
| diffstat | 3 files changed, 6 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- 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.
--- a/doc/posix-functions/pthread_sigmask.texi +++ b/doc/posix-functions/pthread_sigmask.texi @@ -14,7 +14,7 @@ @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:
--- 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