diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2022-09-28 00:29:09 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2022-09-28 00:37:12 -0700 |
| commit | a9b29ee4a0ffa4878d67eaf518dbeed098844b9e (patch) | |
| tree | bbde8d6eae8b3676bb1d9f74d8ce0f6d7016c834 /lib/signal.in.h | |
| parent | c1eb13b32676b288a3ab3826501caf7bcd376b7f (diff) | |
| download | emacs-a9b29ee4a0ffa4878d67eaf518dbeed098844b9e.tar.gz emacs-a9b29ee4a0ffa4878d67eaf518dbeed098844b9e.tar.bz2 emacs-a9b29ee4a0ffa4878d67eaf518dbeed098844b9e.zip | |
Update from Gnulib by running admin/merge-gnulib
Diffstat (limited to 'lib/signal.in.h')
| -rw-r--r-- | lib/signal.in.h | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/lib/signal.in.h b/lib/signal.in.h index 640b5022f5f..c0d4848db0a 100644 --- a/lib/signal.in.h +++ b/lib/signal.in.h @@ -55,13 +55,21 @@ #ifndef _@GUARD_PREFIX@_SIGNAL_H #define _@GUARD_PREFIX@_SIGNAL_H -/* Mac OS X 10.3, FreeBSD 6.4, OpenBSD 3.8, OSF/1 4.0, Solaris 2.6, Android, +/* For testing the OpenBSD version. */ +#if (@GNULIB_PTHREAD_SIGMASK@ || defined GNULIB_POSIXCHECK) \ + && defined __OpenBSD__ +# include <sys/param.h> +#endif + +/* Mac OS X 10.3, FreeBSD < 8.0, OpenBSD < 5.1, OSF/1 4.0, Solaris 2.6, Android, OS/2 kLIBC 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 __sun || defined __ANDROID__ || defined __KLIBC__) \ + || (defined __FreeBSD__ && __FreeBSD__ < 8) \ + || (defined __OpenBSD__ && OpenBSD < 201205) \ + || defined __osf__ || defined __sun || defined __ANDROID__ \ + || defined __KLIBC__) \ && ! defined __GLIBC__ # include <pthread.h> #endif |