From: Eric Blake Date: Mon, 23 Jun 2008 12:41:08 +0000 (-0600) Subject: Avoid SA_ namespace. X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e9d840af0a8dbb1d1f46205177dd57453b579830;p=pspp Avoid SA_ namespace. * tests/test-sigaction.c (MASK_SA_FLAGS): Rename from SA_MASK. Reported by Ralf Wildenhues. Signed-off-by: Eric Blake --- diff --git a/ChangeLog b/ChangeLog index 414c0dfff4..b6ffc1f131 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2008-06-23 Eric Blake + Avoid SA_ namespace. + * tests/test-sigaction.c (MASK_SA_FLAGS): Rename from SA_MASK. + Reported by Ralf Wildenhues. + Avoid test failure due to SA_RESTORER. * tests/test-sigaction.c (SA_MASK): New macro. (main): Avoid failing due to extension flags being set. diff --git a/tests/test-sigaction.c b/tests/test-sigaction.c index e009bf6022..9ef3352f49 100644 --- a/tests/test-sigaction.c +++ b/tests/test-sigaction.c @@ -52,8 +52,8 @@ /* Define a mask of flags required by POSIX. Some implementations provide other flags as extensions, such as SA_RESTORER, that we must ignore in this test. */ -#define SA_MASK (SA_NOCLDSTOP | SA_ONSTACK | SA_RESETHAND | SA_RESTART \ - SA_SIGINFO | SA_NOCLDWAIT | SA_NODEFER) +#define MASK_SA_FLAGS (SA_NOCLDSTOP | SA_ONSTACK | SA_RESETHAND | SA_RESTART \ + SA_SIGINFO | SA_NOCLDWAIT | SA_NODEFER) /* This test is unsafe in the presence of an asynchronous SIGABRT, because we install a signal-handler that is intentionally not @@ -95,7 +95,7 @@ main (int argc, char *argv[]) ASSERT (raise (SIGABRT) == 0); sa.sa_flags = SA_RESETHAND | SA_NODEFER; ASSERT (sigaction (SIGABRT, &sa, &old_sa) == 0); - ASSERT ((old_sa.sa_flags & SA_MASK) == 0); + ASSERT ((old_sa.sa_flags & MASK_SA_FLAGS) == 0); ASSERT (old_sa.sa_handler == handler); ASSERT (raise (SIGABRT) == 0); sa.sa_handler = SIG_DFL;