From: Bruno Haible Date: Sat, 28 Aug 2021 17:39:05 +0000 (+0200) Subject: sigabbrev_np, sigdescr_np: Fix compilation error on Linux/alpha. X-Git-Tag: v1.0~2637 X-Git-Url: https://gitweb.git.savannah.gnu.org/gitweb/?a=commitdiff_plain;h=ecf9863b1f2ed7562b3031d2c6fc010622cd48fe;p=gnulib.git sigabbrev_np, sigdescr_np: Fix compilation error on Linux/alpha. * lib/sigabbrev_np.c (sigabbrev_np): When SIGINFO and SIGPWR have the same value, give precendence to SIGPWR. * lib/sigdescr_np.c (sigdescr_np): Likewise. * tests/test-sigabbrev_np.c (main): Likewise. * tests/test-sigdescr_np.c (main): Likewise. --- diff --git a/ChangeLog b/ChangeLog index 0c1aeceef4..2479ea6f51 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2021-08-28 Bruno Haible + + sigabbrev_np, sigdescr_np: Fix compilation error on Linux/alpha. + * lib/sigabbrev_np.c (sigabbrev_np): When SIGINFO and SIGPWR have the + same value, give precendence to SIGPWR. + * lib/sigdescr_np.c (sigdescr_np): Likewise. + * tests/test-sigabbrev_np.c (main): Likewise. + * tests/test-sigdescr_np.c (main): Likewise. + 2021-08-28 Bruno Haible execle, execve, execvpe tests: Fix test failures under qemu user-mode. diff --git a/lib/sigabbrev_np.c b/lib/sigabbrev_np.c index 5271a16b03..51e2c35321 100644 --- a/lib/sigabbrev_np.c +++ b/lib/sigabbrev_np.c @@ -131,7 +131,7 @@ sigabbrev_np (int sig) case SIGEMT: return "EMT"; #endif /* Mac OS X, FreeBSD, NetBSD, OpenBSD, Minix */ - #if defined SIGINFO + #if defined SIGINFO && SIGINFO != SIGPWR case SIGINFO: return "INFO"; #endif /* Linux, Mac OS X, FreeBSD, NetBSD, OpenBSD, Minix, AIX, IRIX, Cygwin */ diff --git a/lib/sigdescr_np.c b/lib/sigdescr_np.c index 7f8dccf81a..bf6abe55c4 100644 --- a/lib/sigdescr_np.c +++ b/lib/sigdescr_np.c @@ -189,7 +189,7 @@ sigdescr_np (int sig) return "Instruction emulation needed"; #endif /* Mac OS X, FreeBSD, NetBSD, OpenBSD, Minix */ - #if defined SIGINFO + #if defined SIGINFO && SIGINFO != SIGPWR case SIGINFO: return "Information request"; #endif diff --git a/tests/test-sigabbrev_np.c b/tests/test-sigabbrev_np.c index 1138195f96..42947f8dc1 100644 --- a/tests/test-sigabbrev_np.c +++ b/tests/test-sigabbrev_np.c @@ -129,7 +129,7 @@ main (void) ASSERT (strcmp (sigabbrev_np (SIGEMT), "EMT") == 0); #endif /* Mac OS X, FreeBSD, NetBSD, OpenBSD, Minix */ - #ifdef SIGINFO + #ifdef SIGINFO && SIGINFO != SIGPWR ASSERT (strcmp (sigabbrev_np (SIGINFO), "INFO") == 0); #endif /* AIX */ diff --git a/tests/test-sigdescr_np.c b/tests/test-sigdescr_np.c index a3f7f85ce4..5025ac16f4 100644 --- a/tests/test-sigdescr_np.c +++ b/tests/test-sigdescr_np.c @@ -131,7 +131,7 @@ main (void) ASSERT (strcmp (sigdescr_np (SIGEMT), "Instruction emulation needed") == 0); #endif /* Mac OS X, FreeBSD, NetBSD, OpenBSD, Minix */ - #ifdef SIGINFO + #ifdef SIGINFO && SIGINFO != SIGPWR ASSERT (strcmp (sigdescr_np (SIGINFO), "Information request") == 0); #endif /* AIX */