summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--CMake/CurlTests.c20
-rw-r--r--CMake/Platforms/WindowsCache.cmake1
-rw-r--r--CMakeLists.txt7
-rw-r--r--lib/Makefile.netware5
-rw-r--r--lib/config-amigaos.h3
-rw-r--r--lib/config-dos.h3
-rw-r--r--lib/config-mac.h4
-rw-r--r--lib/config-os400.h3
-rw-r--r--lib/config-plan9.h2
-rw-r--r--lib/config-riscos.h3
-rw-r--r--lib/config-tpf.h3
-rw-r--r--lib/config-vxworks.h3
-rw-r--r--lib/config-win32.h3
-rw-r--r--lib/config-win32ce.h3
-rw-r--r--lib/curl_config.h.cmake3
-rw-r--r--lib/curl_setup_once.h11
-rw-r--r--lib/hostip.c2
-rw-r--r--packages/vms/config_h.com12
-rw-r--r--tests/server/util.c6
19 files changed, 12 insertions, 85 deletions
diff --git a/CMake/CurlTests.c b/CMake/CurlTests.c
index 949910d5e..2fcce1bb3 100644
--- a/CMake/CurlTests.c
+++ b/CMake/CurlTests.c
@@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2020, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2021, Daniel Stenberg, <daniel@haxx.se>, et al.
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@@ -214,24 +214,6 @@ if (sizeof (bool *) )
#include <float.h>
int main() { return 0; }
#endif
-#ifdef RETSIGTYPE_TEST
-#include <sys/types.h>
-#include <signal.h>
-#ifdef signal
-# undef signal
-#endif
-#ifdef __cplusplus
-extern "C" void (*signal (int, void (*)(int)))(int);
-#else
-void (*signal ()) ();
-#endif
-
-int
-main ()
-{
- return 0;
-}
-#endif
#ifdef HAVE_INET_NTOA_R_DECL
#include <arpa/inet.h>
diff --git a/CMake/Platforms/WindowsCache.cmake b/CMake/Platforms/WindowsCache.cmake
index e18399917..33c735a22 100644
--- a/CMake/Platforms/WindowsCache.cmake
+++ b/CMake/Platforms/WindowsCache.cmake
@@ -132,7 +132,6 @@ if(NOT UNIX)
set(HAVE_GETADDRINFO 0)
endif()
set(STDC_HEADERS 1)
- set(RETSIGTYPE_TEST 1)
set(HAVE_SIGACTION 0)
set(HAVE_MACRO_SIGSETJMP 0)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index f75815af2..3a20028ba 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1108,7 +1108,6 @@ foreach(CURL_TEST
HAVE_IN_ADDR_T
HAVE_BOOL_T
STDC_HEADERS
- RETSIGTYPE_TEST
HAVE_INET_NTOA_R_DECL
HAVE_INET_NTOA_R_DECL_REENTRANT
HAVE_GETADDRINFO
@@ -1209,12 +1208,6 @@ if(HAVE_FIONBIO OR
set(HAVE_DISABLED_NONBLOCKING)
endif()
-if(RETSIGTYPE_TEST)
- set(RETSIGTYPE void)
-else()
- set(RETSIGTYPE int)
-endif()
-
if(CMAKE_COMPILER_IS_GNUCC AND APPLE)
include(CheckCCompilerFlag)
check_c_compiler_flag(-Wno-long-double HAVE_C_FLAG_Wno_long_double)
diff --git a/lib/Makefile.netware b/lib/Makefile.netware
index 10b77f8ff..863bde022 100644
--- a/lib/Makefile.netware
+++ b/lib/Makefile.netware
@@ -5,8 +5,8 @@
# | (__| |_| | _ <| |___
# \___|\___/|_| \_\_____|
#
-# Copyright (C) 2004 - 2015, Guenter Knauf
-# Copyright (C) 2001 - 2020, Daniel Stenberg, <daniel@haxx.se>, et al.
+# Copyright (C) 2004 - 2015, 2021, Guenter Knauf
+# Copyright (C) 2001 - 2021, Daniel Stenberg, <daniel@haxx.se>, et al.
#
# This software is licensed as described in the file COPYING, which
# you should have received as part of this distribution. The terms
@@ -599,7 +599,6 @@ endif
@echo $(DL)#define HAVE_UTIME 1$(DL) >> $@
@echo $(DL)#define HAVE_UTIME_H 1$(DL) >> $@
@echo $(DL)#define HAVE_WRITEV 1$(DL) >> $@
- @echo $(DL)#define RETSIGTYPE void$(DL) >> $@
@echo $(DL)#define SIZEOF_INT 4$(DL) >> $@
@echo $(DL)#define SIZEOF_SHORT 2$(DL) >> $@
@echo $(DL)#define SIZEOF_STRUCT_IN_ADDR 4$(DL) >> $@
diff --git a/lib/config-amigaos.h b/lib/config-amigaos.h
index 3c9d76ef3..381bf302c 100644
--- a/lib/config-amigaos.h
+++ b/lib/config-amigaos.h
@@ -7,7 +7,7 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2020, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2021, Daniel Stenberg, <daniel@haxx.se>, et al.
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@@ -103,7 +103,6 @@
#define PACKAGE_VERSION "-"
#define CURL_CA_BUNDLE "s:curl-ca-bundle.crt"
-#define RETSIGTYPE void
#define SELECT_TYPE_ARG1 int
#define SELECT_TYPE_ARG234 (fd_set *)
#define SELECT_TYPE_ARG5 (struct timeval *)
diff --git a/lib/config-dos.h b/lib/config-dos.h
index 50816ac75..0fb98e385 100644
--- a/lib/config-dos.h
+++ b/lib/config-dos.h
@@ -7,7 +7,7 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2020, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2021, Daniel Stenberg, <daniel@haxx.se>, et al.
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@@ -84,7 +84,6 @@
#define NEED_MALLOC_H 1
-#define RETSIGTYPE void
#define SIZEOF_INT 4
#define SIZEOF_LONG 4
#define SIZEOF_LONG_DOUBLE 16
diff --git a/lib/config-mac.h b/lib/config-mac.h
index 4e610562f..163686ec9 100644
--- a/lib/config-mac.h
+++ b/lib/config-mac.h
@@ -7,7 +7,7 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2020, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2021, Daniel Stenberg, <daniel@haxx.se>, et al.
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@@ -81,8 +81,6 @@
#define HAVE_IOCTL 1
#define HAVE_IOCTL_FIONBIO 1
-#define RETSIGTYPE void
-
#define SIZEOF_INT 4
#define SIZEOF_SHORT 2
#define SIZEOF_SIZE_T 4
diff --git a/lib/config-os400.h b/lib/config-os400.h
index 67fbc41d8..b5a9823fd 100644
--- a/lib/config-os400.h
+++ b/lib/config-os400.h
@@ -376,9 +376,6 @@
/* Name of package */
#undef PACKAGE
-/* Define as the return type of signal handlers (`int' or `void'). */
-#define RETSIGTYPE void
-
/* The size of `int', as computed by sizeof. */
#define SIZEOF_INT 4
diff --git a/lib/config-plan9.h b/lib/config-plan9.h
index fc19c5f03..ecfc27372 100644
--- a/lib/config-plan9.h
+++ b/lib/config-plan9.h
@@ -40,8 +40,6 @@
#define RANDOM_FILE "/dev/random"
#define VERSION "0.0.0" /* TODO */
-#define RETSIGTYPE void
-
#define STDC_HEADERS 1
#ifdef _BITS64
diff --git a/lib/config-riscos.h b/lib/config-riscos.h
index 43b1deb6d..2dc3c6631 100644
--- a/lib/config-riscos.h
+++ b/lib/config-riscos.h
@@ -353,9 +353,6 @@
/* Name of package */
#undef PACKAGE
-/* Define as the return type of signal handlers (`int' or `void'). */
-#define RETSIGTYPE void
-
/* The size of `int', as computed by sizeof. */
#define SIZEOF_INT 4
diff --git a/lib/config-tpf.h b/lib/config-tpf.h
index 4f8a07e9b..3fdb8924c 100644
--- a/lib/config-tpf.h
+++ b/lib/config-tpf.h
@@ -578,9 +578,6 @@
/* a suitable file to read random data from */
/* #undef RANDOM_FILE */
-/* Define as the return type of signal handlers (`int' or `void'). */
-#define RETSIGTYPE void
-
/* Define to the type of arg 1 for `select'. */
#define SELECT_TYPE_ARG1 int
diff --git a/lib/config-vxworks.h b/lib/config-vxworks.h
index f81195285..c4925bb22 100644
--- a/lib/config-vxworks.h
+++ b/lib/config-vxworks.h
@@ -769,9 +769,6 @@
/* Define to the function return type for recv. */
#define RECV_TYPE_RETV int
-/* Define as the return type of signal handlers (`int' or `void'). */
-#define RETSIGTYPE void
-
/* Define to the type qualifier of arg 5 for select. */
#define SELECT_QUAL_ARG5
diff --git a/lib/config-win32.h b/lib/config-win32.h
index 0817ec5b1..2e060f95c 100644
--- a/lib/config-win32.h
+++ b/lib/config-win32.h
@@ -362,9 +362,6 @@
/* Define if in_addr_t is not an available 'typedefed' type. */
#define in_addr_t unsigned long
-/* Define to the return type of signal handlers (int or void). */
-#define RETSIGTYPE void
-
/* Define if ssize_t is not an available 'typedefed' type. */
#ifndef _SSIZE_T_DEFINED
# if (defined(__WATCOMC__) && (__WATCOMC__ >= 1240)) || \
diff --git a/lib/config-win32ce.h b/lib/config-win32ce.h
index 7f59fd562..fb29e088f 100644
--- a/lib/config-win32ce.h
+++ b/lib/config-win32ce.h
@@ -307,9 +307,6 @@
/* Define this if in_addr_t is not an available 'typedefed' type */
#define in_addr_t unsigned long
-/* Define as the return type of signal handlers (int or void). */
-#define RETSIGTYPE void
-
/* Define ssize_t if it is not an available 'typedefed' type */
#if (defined(__WATCOMC__) && (__WATCOMC__ >= 1240)) || defined(__POCC__)
#elif defined(_WIN64)
diff --git a/lib/curl_config.h.cmake b/lib/curl_config.h.cmake
index fc1857ebb..d64c89ce3 100644
--- a/lib/curl_config.h.cmake
+++ b/lib/curl_config.h.cmake
@@ -876,9 +876,6 @@
/* Define to the function return type for recv. */
#cmakedefine RECV_TYPE_RETV ${RECV_TYPE_RETV}
-/* Define as the return type of signal handlers (`int' or `void'). */
-#cmakedefine RETSIGTYPE ${RETSIGTYPE}
-
/* Define to the type qualifier of arg 5 for select. */
#cmakedefine SELECT_QUAL_ARG5 ${SELECT_QUAL_ARG5}
diff --git a/lib/curl_setup_once.h b/lib/curl_setup_once.h
index ef60bc7ae..adf1e11f8 100644
--- a/lib/curl_setup_once.h
+++ b/lib/curl_setup_once.h
@@ -7,7 +7,7 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2020, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2021, Daniel Stenberg, <daniel@haxx.se>, et al.
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@@ -351,15 +351,6 @@ typedef int sig_atomic_t;
/*
- * Default return type for signal handlers.
- */
-
-#ifndef RETSIGTYPE
-#define RETSIGTYPE void
-#endif
-
-
-/*
* Macro used to include code only in debug builds.
*/
diff --git a/lib/hostip.c b/lib/hostip.c
index 34fb7db65..05c09f683 100644
--- a/lib/hostip.c
+++ b/lib/hostip.c
@@ -631,7 +631,7 @@ enum resolve_t Curl_resolv(struct Curl_easy *data,
* within a signal handler which is nonportable and could lead to problems.
*/
static
-RETSIGTYPE alarmfunc(int sig)
+void alarmfunc(int sig)
{
/* this is for "-ansi -Wall -pedantic" to stop complaining! (rabe) */
(void)sig;
diff --git a/packages/vms/config_h.com b/packages/vms/config_h.com
index 6973eacf1..af97eb118 100644
--- a/packages/vms/config_h.com
+++ b/packages/vms/config_h.com
@@ -28,7 +28,7 @@ $!
$! This procedure may not guess the options correctly for all architectures,
$! and is a work in progress.
$!
-$! Copyright 2011 - 2020, John Malmberg
+$! Copyright 2011 - 2021, John Malmberg
$!
$! Permission to use, copy, modify, and/or distribute this software for any
$! purpose with or without fee is hereby granted, provided that the above
@@ -1855,16 +1855,6 @@ $ write tf "#endif"
$ goto cfgh_in_loop1
$ endif
$!
-$! Process RETSIGTYPE directive
-$!----------------------------------
-$ if key2 .eqs. "RETSIGTYPE"
-$ then
-$ write tf "#ifndef RETSIGTYPE"
-$ write tf "#define RETSIGTYPE void"
-$ write tf "#endif"
-$ goto cfgh_in_loop1
-$ endif
-$!
$! Process STDC_HEADERS (SAMBA!)
$!---------------------------
$ if key2 .eqs. "STDC_HEADERS"
diff --git a/tests/server/util.c b/tests/server/util.c
index bfd133cec..c4f16e451 100644
--- a/tests/server/util.c
+++ b/tests/server/util.c
@@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2020, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2021, Daniel Stenberg, <daniel@haxx.se>, et al.
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@@ -543,7 +543,7 @@ long timediff(struct timeval newer, struct timeval older)
/* vars used to keep around previous signal handlers */
-typedef RETSIGTYPE (*SIGHANDLER_T)(int);
+typedef void (*SIGHANDLER_T)(int);
#ifdef SIGHUP
static SIGHANDLER_T old_sighup_handler = SIG_ERR;
@@ -591,7 +591,7 @@ HANDLE exit_event = NULL;
* The first time this is called it will set got_exit_signal to one and
* store in exit_signal the signal that triggered its execution.
*/
-static RETSIGTYPE exit_signal_handler(int signum)
+static void exit_signal_handler(int signum)
{
int old_errno = errno;
logmsg("exit_signal_handler: %d", signum);
View Lorry Controller Status