[Xquartz-changes] xserver: Branch 'master'

[Jeremy Huddleston]

Rebased ref, commits from common ancestor:
commit b90b3f6eac34616c46ab693fafbf6b73a04f407b
Author: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
Date:   Mon Aug 27 17:15:19 2012 -0700

    test: Make os test more compliant
    
    sighandler_t is not UNIX.
    
    Regression from: 7f09126e068015db54c56bb982b8f91065375700
    
    Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
    Reviewed-by: Peter Hutterer <peter.hutterer at who-t.net>

diff --git a/test/os.c b/test/os.c
index 8f1107d..2d005a0 100644
--- a/test/os.c
+++ b/test/os.c
@@ -149,7 +149,7 @@ static void block_sigio_test_nested(void)
                 tail guard
        tail guard must be hit.
      */
-    sighandler_t old_handler;
+    void (*old_handler)(int);
     old_handler = signal(SIGIO, sighandler);
     expect_signal = 1;
     assert(raise(SIGIO) == 0);