Avoid SA_ namespace.

* tests/test-sigaction.c (MASK_SA_FLAGS): Rename from SA_MASK.
Reported by Ralf Wildenhues.

Signed-off-by: Eric Blake <ebb9@byu.net>

diff --git a/ChangeLog b/ChangeLog
index 414c0dfff4322eebbf82c0326e9f7f55e317b5ce..b6ffc1f1318c4e357f6f3ddf2a5bcc1296bd257f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2008-06-23  Eric Blake  <ebb9@byu.net>
 
+       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 e009bf602290212de9240d2b2ef5fd2469a48a48..9ef3352f4964e2150d17056cb7cfd7dbb6016f27 100644 (file)
--- 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;