From ca9f9dea7c84393e648ea3bb2614ca85e2de5d65 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sun, 18 Sep 2022 14:41:20 +0200 Subject: [PATCH] signal: Fix a C++ compilation error due to sched_yield on OpenBSD 6.0. MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit * lib/signal.in.h: On OpenBSD, include . Don't include on OpenBSD ≥ 5.1. --- ChangeLog | 6 ++++++ lib/signal.in.h | 11 +++++++++-- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8c4d6a2476..d38fa2dc41 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2022-09-18 Bruno Haible + + signal: Fix a C++ compilation error due to sched_yield on OpenBSD 6.0. + * lib/signal.in.h: On OpenBSD, include . Don't include + on OpenBSD ≥ 5.1. + 2022-09-17 Bruno Haible wchar: Fix compilation errors in C++ mode on Solaris 11.3. diff --git a/lib/signal.in.h b/lib/signal.in.h index 5d2d80c99d..c0d4848db0 100644 --- a/lib/signal.in.h +++ b/lib/signal.in.h @@ -55,12 +55,19 @@ #ifndef _@GUARD_PREFIX@_SIGNAL_H #define _@GUARD_PREFIX@_SIGNAL_H -/* Mac OS X 10.3, FreeBSD < 8.0, 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 +#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 , not in . But avoid namespace pollution on glibc systems.*/ #if (@GNULIB_PTHREAD_SIGMASK@ || defined GNULIB_POSIXCHECK) \ && ((defined __APPLE__ && defined __MACH__) \ - || (defined __FreeBSD__ && __FreeBSD__ < 8) || defined __OpenBSD__ \ + || (defined __FreeBSD__ && __FreeBSD__ < 8) \ + || (defined __OpenBSD__ && OpenBSD < 201205) \ || defined __osf__ || defined __sun || defined __ANDROID__ \ || defined __KLIBC__) \ && ! defined __GLIBC__ -- 2.39.5