From 46b33708e4fb56d9280596bb008dc6da9571f313 Mon Sep 17 00:00:00 2001
From: Martin Nilsson <nilsson@opera.com>
Date: Thu, 4 Sep 2014 15:10:45 +0200
Subject: [PATCH] signal is C89, so assume it exists.
---
src/configure.in | 1 -
src/main.c | 2 --
src/modules/HTTPLoop/accept_and_parse.h | 4 +---
src/modules/HTTPLoop/configure.in | 2 +-
src/post_modules/GTK1/configure.in | 2 +-
src/post_modules/GTK2/configure.in | 2 +-
src/signal_handler.c | 2 --
7 files changed, 4 insertions(+), 11 deletions(-)
diff --git a/src/configure.in b/src/configure.in
index 5423393d26..8bbde47d8e 100644
--- a/src/configure.in
+++ b/src/configure.in
@@ -4527,7 +4527,6 @@ AC_CHECK_FUNCS( \
ptrace \
setrlimit \
setresuid \
- signal \
sigaction \
sigvec \
strcasecmp \
diff --git a/src/main.c b/src/main.c
index 5dae998f28..e1ce19ed78 100644
--- a/src/main.c
+++ b/src/main.c
@@ -297,7 +297,6 @@ int main(int argc, char **argv)
char *p;
#ifdef PIKE_EXTRA_DEBUG
-#ifdef HAVE_SIGNAL
if (sizeof(void *) == 8) {
/* 64-bit Solaris 10 in Xenofarm fails with SIGPIPE.
* Force a core dump.
@@ -305,7 +304,6 @@ int main(int argc, char **argv)
signal(SIGPIPE, abort);
}
#endif
-#endif
#ifdef HAVE_MALLOPT
TRACE((stderr, "Init malloc...\n"));
diff --git a/src/modules/HTTPLoop/accept_and_parse.h b/src/modules/HTTPLoop/accept_and_parse.h
index 62ff69cace..39f817c0f4 100644
--- a/src/modules/HTTPLoop/accept_and_parse.h
+++ b/src/modules/HTTPLoop/accept_and_parse.h
@@ -8,9 +8,7 @@
#define CACHE_HTABLE_SIZE 40951
#if !defined(__NT__) && !defined(__WIN32__)
-#ifdef HAVE_SIGNAL
-# define HAVE_TIMEOUTS
-#endif
+#define HAVE_TIMEOUTS
#endif
struct res
diff --git a/src/modules/HTTPLoop/configure.in b/src/modules/HTTPLoop/configure.in
index 29c0c1a586..7340a5f345 100644
--- a/src/modules/HTTPLoop/configure.in
+++ b/src/modules/HTTPLoop/configure.in
@@ -18,7 +18,7 @@ if test "$ac_cv_header_winsock2_h" = "yes"; then :; else
AC_CHECK_HEADERS(winsock.h)
fi
-AC_CHECK_FUNCS(poll gmtime_r gmtime sendfile signal inet_ntoa inet_ntop)
+AC_CHECK_FUNCS(poll gmtime_r gmtime sendfile inet_ntoa inet_ntop)
AC_SUBST(RANLIB)
diff --git a/src/post_modules/GTK1/configure.in b/src/post_modules/GTK1/configure.in
index 21e0d5e825..2d55db167f 100644
--- a/src/post_modules/GTK1/configure.in
+++ b/src/post_modules/GTK1/configure.in
@@ -274,7 +274,7 @@ AC_HEADER_STDC
AC_CHECK_HEADERS( signal.h netinet/in.h arpa/inet.h sys/types.h sys/stat.h \
fcntl.h)
-AC_CHECK_FUNCS( gethrtime signal sigaction )
+AC_CHECK_FUNCS( gethrtime sigaction )
if test "x$with_GTK" = "xyes" ; then
diff --git a/src/post_modules/GTK2/configure.in b/src/post_modules/GTK2/configure.in
index 7818cff5ff..218fe520be 100644
--- a/src/post_modules/GTK2/configure.in
+++ b/src/post_modules/GTK2/configure.in
@@ -19,7 +19,7 @@ AC_HEADER_STDC
# Must be before AC_CHECK_FUNCS for PIKE_FUNCS_NEED_DECLS to work.
AC_CHECK_HEADERS( signal.h netinet/in.h arpa/inet.h sys/types.h sys/stat.h fcntl.h )
-AC_CHECK_FUNCS( gethrtime signal sigaction )
+AC_CHECK_FUNCS( gethrtime sigaction )
AC_PATH_PROG(PKG_CONFIG,${ac_tool_prefix}pkg-config,no)
diff --git a/src/signal_handler.c b/src/signal_handler.c
index b65d31cbcf..b7fc502007 100644
--- a/src/signal_handler.c
+++ b/src/signal_handler.c
@@ -3881,7 +3881,6 @@ void f_create_process(INT32 args)
{
int i;
/* Restore the signals to the defaults. */
-#ifdef HAVE_SIGNAL
#ifdef _sys_nsig
for(i=0; i<_sys_nsig; i++)
signal(i, SIG_DFL);
@@ -3889,7 +3888,6 @@ void f_create_process(INT32 args)
for(i=0; i<NSIG; i++)
signal(i, SIG_DFL);
#endif /* _sys_nsig */
-#endif /* HAVE_SIGNAL */
}
if(mchroot)
--
GitLab