[PATCH libxtrans 3/3] xtrans.m4: remove AC_TYPE_SIGNAL and Imake SIGNALRETURNSINT

Gaetan Nadon memsize at videotron.ca
Mon Dec 16 06:46:31 PST 2013


Assume signal handlers return void, as C89 requires

Drops use of autoconf's obsolete AC_TYPE_SIGNAL and Imake's even more
obsolete SIGNALRETURNSINT.

None of the modules including xtrans.m4 uses RETSIGTYPE from autoconf.

Signed-off-by: Gaetan Nadon <memsize at videotron.ca>
---
 Xtransutil.c |   14 +-------------
 xtrans.m4    |    1 -
 2 files changed, 1 insertion(+), 14 deletions(-)

diff --git a/Xtransutil.c b/Xtransutil.c
index a6928bb..63f0fc3 100644
--- a/Xtransutil.c
+++ b/Xtransutil.c
@@ -306,24 +306,12 @@ static jmp_buf env;
 #ifdef SIGALRM
 static volatile int nameserver_timedout = 0;
 
-static
-#ifdef RETSIGTYPE /* set by autoconf AC_TYPE_SIGNAL */
-RETSIGTYPE
-#else /* Imake */
-#ifdef SIGNALRETURNSINT
-int
-#else
-void
-#endif
-#endif
+static void
 nameserver_lost(int sig _X_UNUSED)
 {
   nameserver_timedout = 1;
   longjmp (env, -1);
   /* NOTREACHED */
-#ifdef SIGNALRETURNSINT
-  return -1;				/* for picky compilers */
-#endif
 }
 #endif /* SIGALARM */
 
diff --git a/xtrans.m4 b/xtrans.m4
index f578b3f..fe128b4 100644
--- a/xtrans.m4
+++ b/xtrans.m4
@@ -100,7 +100,6 @@ AC_INCLUDES_DEFAULT
 # that use Xtrans functions
 AC_DEFUN([XTRANS_CONNECTION_FLAGS],[
  AC_REQUIRE([AC_CANONICAL_HOST])
- AC_REQUIRE([AC_TYPE_SIGNAL])
  [case $host_os in
 	mingw*)	unixdef="no"   ;;
 	*)	unixdef="yes"  ;;
-- 
1.7.9.5



More information about the xorg-devel mailing list