From: Mike Frysinger <vapier@gentoo.org>
Date: Sun, 10 Aug 2014 02:12:55 +0000 (-0400)
Subject: signal: fix thinko in sa_restorer
X-Git-Tag: v4.9~14
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6ab2ed119aa46a5accd6d2a952033375169e727a;p=strace

signal: fix thinko in sa_restorer

Previous commit here re-added the bugs trying to be fixed due to a
logic thinko.  The patches were tested in isolation and hand merged
later.  Oops.

* signal.c (struct new_sigaction): Change || to &&.
---

diff --git a/signal.c b/signal.c
index 6a565f5a..9a7c82f0 100644
--- a/signal.c
+++ b/signal.c
@@ -1134,9 +1134,9 @@ struct new_sigaction
 #else
 	void (*__sa_handler)(int);
 	unsigned long sa_flags;
-# if !defined(ALPHA) || !defined(HPPA)
+# if !defined(ALPHA) && !defined(HPPA)
 	void (*sa_restorer)(void);
-# endif /* !ALPHA || !HPPA */
+# endif /* !ALPHA && !HPPA */
 #endif /* !MIPS */
 	/* Kernel treats sa_mask as an array of longs. */
 	unsigned long sa_mask[NSIG / sizeof(long) ? NSIG / sizeof(long) : 1];