[PATCH xinit 12/14] Use signals from Unix98 and drop pre-POSIX compatibility
Mikhail Gusarov
dottedmag at dottedmag.net
Tue Apr 13 13:03:27 PDT 2010
Signed-off-by: Mikhail Gusarov <dottedmag at dottedmag.net>
---
configure.ac | 2 --
xinit.c | 21 ++-------------------
2 files changed, 2 insertions(+), 21 deletions(-)
diff --git a/configure.ac b/configure.ac
index 0ead99d..8930b39 100644
--- a/configure.ac
+++ b/configure.ac
@@ -40,8 +40,6 @@ AC_PROG_INSTALL
AC_PATH_PROG(SED,sed)
AC_CANONICAL_HOST
-AC_TYPE_SIGNAL
-
m4_ifdef([AS_HELP_STRING], , [m4_define([AS_HELP_STRING], m4_defn([AC_HELP_STRING]))])
diff --git a/xinit.c b/xinit.c
index 220b3af..f0af5eb 100644
--- a/xinit.c
+++ b/xinit.c
@@ -35,20 +35,7 @@ in this Software without prior written authorization from The Open Group.
#include <ctype.h>
#include <stdint.h>
-#ifdef X_POSIX_C_SOURCE
-#define _POSIX_C_SOURCE X_POSIX_C_SOURCE
#include <signal.h>
-#undef _POSIX_C_SOURCE
-#else
-#if defined(X_NOT_POSIX) || defined(_POSIX_SOURCE)
-#include <signal.h>
-#else
-#define _POSIX_SOURCE
-#include <signal.h>
-#undef _POSIX_SOURCE
-#endif
-#endif
-
#include <sys/wait.h>
#include <errno.h>
#include <setjmp.h>
@@ -125,18 +112,14 @@ static void set_environment(void);
static void Fatal(char *msg);
static void Error(char *fmt, ...);
-#ifdef RETSIGTYPE /* autoconf AC_TYPE_SIGNAL */
-# define SIGVAL RETSIGTYPE
-#endif /* RETSIGTYPE */
-
-static SIGVAL
+static void
sigCatch(int sig)
{
/* On system with POSIX signals, just interrupt the system call */
gotSignal = sig;
}
-static SIGVAL
+static void
sigIgnore(int sig)
{
}
--
1.7.0
More information about the xorg-devel
mailing list