From 06edede5c6157d8222d6d0c37fe9b7cbf2053f14 Mon Sep 17 00:00:00 2001
From: =?utf8?q?R=C3=A9mi=20Denis-Courmont?= <remi@remlab.net>
Date: Fri, 10 Apr 2009 16:24:14 +0300
Subject: [PATCH] Remove useless check for (C89) <signal.h>

---
 configure.ac               |  2 +-
 modules/misc/screensaver.c |  5 +----
 src/extras/libc.c          |  4 +---
 src/misc/cpu.c             | 32 +++++++++-----------------------
 4 files changed, 12 insertions(+), 31 deletions(-)

diff --git a/configure.ac b/configure.ac
index 75f60c2ee2..77db452218 100644
--- a/configure.ac
+++ b/configure.ac
@@ -829,7 +829,7 @@ AC_EGREP_HEADER(strncasecmp,strings.h,[
   AC_MSG_RESULT(no)])
 
 dnl Check for headers
-AC_CHECK_HEADERS(signal.h time.h errno.h stdint.h stdbool.h getopt.h strings.h inttypes.h sys/int_types.h wchar.h locale.h)
+AC_CHECK_HEADERS(time.h errno.h stdint.h stdbool.h getopt.h strings.h inttypes.h sys/int_types.h wchar.h locale.h)
 AC_CHECK_HEADERS(sys/sockio.h fcntl.h sys/types.h sys/time.h sys/times.h sys/ioctl.h sys/stat.h xlocale.h)
 AC_CHECK_HEADERS([arpa/inet.h netinet/in.h netinet/udplite.h sys/eventfd.h])
 AC_CHECK_HEADERS([net/if.h], [], [],
diff --git a/modules/misc/screensaver.c b/modules/misc/screensaver.c
index 6a4643ac92..24448bc503 100644
--- a/modules/misc/screensaver.c
+++ b/modules/misc/screensaver.c
@@ -40,10 +40,7 @@
 #include <sys/types.h>
 #include <sys/wait.h>
 #include <unistd.h>
-
-#ifdef HAVE_SIGNAL_H
-#   include <signal.h>
-#endif
+#include <signal.h>
 
 #ifdef HAVE_DBUS
 
diff --git a/src/extras/libc.c b/src/extras/libc.c
index ad67e13413..acd0924027 100644
--- a/src/extras/libc.c
+++ b/src/extras/libc.c
@@ -47,9 +47,7 @@
 #   include <dirent.h>
 #endif
 
-#ifdef HAVE_SIGNAL_H
-#   include <signal.h>
-#endif
+#include <signal.h>
 
 #ifdef HAVE_FORK
 #   include <sys/time.h>
diff --git a/src/misc/cpu.c b/src/misc/cpu.c
index dba7c1f55a..bfaf139ed4 100644
--- a/src/misc/cpu.c
+++ b/src/misc/cpu.c
@@ -32,10 +32,8 @@
 
 #include <vlc_common.h>
 
-#ifdef HAVE_SIGNAL_H
-#   include <signal.h>                            /* SIGHUP, SIGINT, SIGKILL */
-#   include <setjmp.h>                                    /* longjmp, setjmp */
-#endif
+#include <signal.h>                            /* SIGHUP, SIGINT, SIGKILL */
+#include <setjmp.h>                                    /* longjmp, setjmp */
 
 #include "libvlc.h"
 
@@ -46,20 +44,16 @@
 /*****************************************************************************
  * Local prototypes
  *****************************************************************************/
-#ifdef HAVE_SIGNAL_H
 static void SigHandler   ( int );
-#endif
 
 /*****************************************************************************
  * Global variables - they're needed for signal handling
  *****************************************************************************/
-#ifdef HAVE_SIGNAL_H
 static jmp_buf env;
 static int     i_illegal;
 #if defined( __i386__ ) || defined( __x86_64__ )
 static const char *psz_capability;
 #endif
-#endif
 
 /*****************************************************************************
  * CPUCapabilities: get the CPU capabilities
@@ -112,8 +106,7 @@ uint32_t CPUCapabilities( void )
                          : "cc" );
 #   endif
 
-#   if defined( CAN_COMPILE_SSE ) || defined ( CAN_COMPILE_3DNOW ) \
-     && defined( HAVE_SIGNAL_H )
+#   if defined( CAN_COMPILE_SSE ) || defined ( CAN_COMPILE_3DNOW )
     void (*pf_sigill) (int) = signal( SIGILL, SigHandler );
 #   endif
 
@@ -139,8 +132,7 @@ uint32_t CPUCapabilities( void )
 
     if( i_eax == i_ebx )
     {
-#       if defined( CAN_COMPILE_SSE ) || defined ( CAN_COMPILE_3DNOW ) \
-            && defined( HAVE_SIGNAL_H )
+#       if defined( CAN_COMPILE_SSE ) || defined ( CAN_COMPILE_3DNOW )
         signal( SIGILL, pf_sigill );
 #       endif
         return i_capabilities;
@@ -156,8 +148,7 @@ uint32_t CPUCapabilities( void )
 
     if( !i_eax )
     {
-#   if defined( CAN_COMPILE_SSE ) || defined ( CAN_COMPILE_3DNOW ) \
-     && defined( HAVE_SIGNAL_H )
+#   if defined( CAN_COMPILE_SSE ) || defined ( CAN_COMPILE_3DNOW )
         signal( SIGILL, pf_sigill );
 #   endif
         return i_capabilities;
@@ -175,8 +166,7 @@ uint32_t CPUCapabilities( void )
 
     if( ! (i_edx & 0x00800000) )
     {
-#   if defined( CAN_COMPILE_SSE ) || defined ( CAN_COMPILE_3DNOW ) \
-     && defined( HAVE_SIGNAL_H )
+#   if defined( CAN_COMPILE_SSE ) || defined ( CAN_COMPILE_3DNOW )
         signal( SIGILL, pf_sigill );
 #   endif
         return i_capabilities;
@@ -231,8 +221,7 @@ uint32_t CPUCapabilities( void )
 
     if( i_eax < 0x80000001 )
     {
-#   if defined( CAN_COMPILE_SSE ) || defined ( CAN_COMPILE_3DNOW ) \
-     && defined( HAVE_SIGNAL_H )
+#   if defined( CAN_COMPILE_SSE ) || defined ( CAN_COMPILE_3DNOW )
         signal( SIGILL, pf_sigill );
 #   endif
         return i_capabilities;
@@ -265,15 +254,14 @@ uint32_t CPUCapabilities( void )
         i_capabilities |= CPU_CAPABILITY_MMXEXT;
     }
 
-#   if defined( CAN_COMPILE_SSE ) || defined ( CAN_COMPILE_3DNOW ) \
-     && defined( HAVE_SIGNAL_H )
+#   if defined( CAN_COMPILE_SSE ) || defined ( CAN_COMPILE_3DNOW )
     signal( SIGILL, pf_sigill );
 #   endif
     return i_capabilities;
 
 #elif defined( __powerpc__ ) || defined( __ppc__ ) || defined( __ppc64__ )
 
-#   ifdef CAN_COMPILE_ALTIVEC && defined( HAVE_SIGNAL_H )
+#   ifdef CAN_COMPILE_ALTIVEC
     void (*pf_sigill) (int) = signal( SIGILL, SigHandler );
 
     i_capabilities |= CPU_CAPABILITY_FPU;
@@ -322,7 +310,6 @@ uint32_t CPUCapabilities( void )
  * This function is called when an illegal instruction signal is received by
  * the program. We use this function to test OS and CPU capabilities
  *****************************************************************************/
-#if defined( HAVE_SIGNAL_H )
 static void SigHandler( int i_signal )
 {
     /* Acknowledge the signal received */
@@ -346,7 +333,6 @@ static void SigHandler( int i_signal )
 
     longjmp( env, 1 );
 }
-#endif
 
 
 uint32_t cpu_flags = 0;
-- 
2.39.2