xserver: Branch 'master'

[Eric Anholt]

 os/utils.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
diff-tree 6da39c67905500ab2db00a45cda4a9f756cdde96 (from 257c8ed17f4f908e0d0d5e53aaf13aa3b1313f50)
Author: Eric Anholt <eric at anholt.net>
Date:   Wed Sep 12 13:23:13 2007 +0000

    Fix build on FreeBSD after Popen changes.

diff --git a/os/utils.c b/os/utils.c
index afcaae4..144098b 100644
--- a/os/utils.c
+++ b/os/utils.c
@@ -1720,7 +1720,7 @@ static struct pid {
     int pid;
 } *pidlist;
 
-static sighandler_t old_alarm = NULL; /* XXX horrible awful hack */
+void (*old_alarm)(int) = NULL; /* XXX horrible awful hack */
 
 pointer
 Popen(char *command, char *type)