From 83245d9ff352b742753cff1216781ff041e4e987 Mon Sep 17 00:00:00 2001 From: Dan Fandrich Date: Mon, 28 Jun 2021 08:30:32 -0700 Subject: Get rid of the unused HAVE_SIG_ATOMIC_T et. al. It was added in 2006 but I see no evidence it was ever used. --- CMake/OtherTests.cmake | 22 ---------------------- acinclude.m4 | 44 -------------------------------------------- configure.ac | 2 -- lib/Makefile.netware | 1 - lib/config-amigaos.h | 1 - lib/config-mac.h | 1 - lib/config-os400.h | 6 ------ lib/config-plan9.h | 1 - lib/config-riscos.h | 6 ------ lib/config-tpf.h | 6 ------ lib/config-vxworks.h | 6 ------ lib/config-win32.h | 3 --- lib/config-win32ce.h | 3 --- lib/curl_config.h.cmake | 6 ------ lib/curl_setup_once.h | 20 -------------------- 15 files changed, 128 deletions(-) diff --git a/CMake/OtherTests.cmake b/CMake/OtherTests.cmake index 466b5674a..7f369938f 100644 --- a/CMake/OtherTests.cmake +++ b/CMake/OtherTests.cmake @@ -220,28 +220,6 @@ int main(void) { return 0; }" HAVE_STRUCT_TIMEVAL) -set(HAVE_SIG_ATOMIC_T 1) -set(CMAKE_REQUIRED_FLAGS) -if(HAVE_SIGNAL_H) - set(CMAKE_REQUIRED_FLAGS "-DHAVE_SIGNAL_H") - set(CMAKE_EXTRA_INCLUDE_FILES "signal.h") -endif() -check_type_size("sig_atomic_t" SIZEOF_SIG_ATOMIC_T) -if(HAVE_SIZEOF_SIG_ATOMIC_T) - check_c_source_compiles(" - #ifdef HAVE_SIGNAL_H - # include - #endif - int main(void) { - static volatile sig_atomic_t dummy = 0; - (void)dummy; - return 0; - }" HAVE_SIG_ATOMIC_T_NOT_VOLATILE) - if(NOT HAVE_SIG_ATOMIC_T_NOT_VOLATILE) - set(HAVE_SIG_ATOMIC_T_VOLATILE 1) - endif() -endif() - if(HAVE_WINDOWS_H) set(CMAKE_EXTRA_INCLUDE_FILES winsock2.h) else() diff --git a/acinclude.m4 b/acinclude.m4 index 23c06d678..277902dac 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -1458,50 +1458,6 @@ AC_DEFUN([CURL_CHECK_STRUCT_TIMEVAL], [ ]) -dnl TYPE_SIG_ATOMIC_T -dnl ------------------------------------------------- -dnl Check if the sig_atomic_t type is available, and -dnl verify if it is already defined as volatile. - -AC_DEFUN([TYPE_SIG_ATOMIC_T], [ - AC_CHECK_HEADERS(signal.h) - AC_CHECK_TYPE([sig_atomic_t],[ - AC_DEFINE(HAVE_SIG_ATOMIC_T, 1, - [Define to 1 if sig_atomic_t is an available typedef.]) - ], ,[ -#ifdef HAVE_SIGNAL_H -#include -#endif - ]) - case "$ac_cv_type_sig_atomic_t" in - yes) - # - AC_MSG_CHECKING([if sig_atomic_t is already defined as volatile]) - AC_LINK_IFELSE([ - AC_LANG_PROGRAM([[ -#ifdef HAVE_SIGNAL_H -#include -#endif - ]],[[ - static volatile sig_atomic_t dummy = 0; - ]]) - ],[ - AC_MSG_RESULT([no]) - curl_cv_sig_atomic_t_volatile="no" - ],[ - AC_MSG_RESULT([yes]) - curl_cv_sig_atomic_t_volatile="yes" - ]) - # - if test "$curl_cv_sig_atomic_t_volatile" = "yes"; then - AC_DEFINE(HAVE_SIG_ATOMIC_T_VOLATILE, 1, - [Define to 1 if sig_atomic_t is already defined as volatile.]) - fi - ;; - esac -]) - - dnl TYPE_IN_ADDR_T dnl ------------------------------------------------- dnl Check for in_addr_t: it is used to receive the return code of inet_addr() diff --git a/configure.ac b/configure.ac index 8a8856df4..ec360bcc5 100644 --- a/configure.ac +++ b/configure.ac @@ -3205,8 +3205,6 @@ TYPE_IN_ADDR_T TYPE_SOCKADDR_STORAGE -TYPE_SIG_ATOMIC_T - CURL_CHECK_FUNC_SELECT CURL_CHECK_FUNC_RECV diff --git a/lib/Makefile.netware b/lib/Makefile.netware index cf7904aa7..92752128d 100644 --- a/lib/Makefile.netware +++ b/lib/Makefile.netware @@ -580,7 +580,6 @@ endif @echo $(DL)#define HAVE_SETLOCALE 1$(DL) >> $@ @echo $(DL)#define HAVE_SIGNAL 1$(DL) >> $@ @echo $(DL)#define HAVE_SIGNAL_H 1$(DL) >> $@ - @echo $(DL)#define HAVE_SIG_ATOMIC_T 1$(DL) >> $@ @echo $(DL)#define HAVE_SOCKET 1$(DL) >> $@ @echo $(DL)#define HAVE_STDLIB_H 1$(DL) >> $@ @echo $(DL)#define HAVE_STRDUP 1$(DL) >> $@ diff --git a/lib/config-amigaos.h b/lib/config-amigaos.h index 0bbf4c41d..842cbc247 100644 --- a/lib/config-amigaos.h +++ b/lib/config-amigaos.h @@ -55,7 +55,6 @@ #define HAVE_SETJMP_H 1 #define HAVE_SIGNAL 1 #define HAVE_SIGNAL_H 1 -#define HAVE_SIG_ATOMIC_T 1 #define HAVE_SOCKET 1 #define HAVE_STRCASECMP 1 #define HAVE_STRDUP 1 diff --git a/lib/config-mac.h b/lib/config-mac.h index c8833e300..22d32d480 100644 --- a/lib/config-mac.h +++ b/lib/config-mac.h @@ -67,7 +67,6 @@ #define HAVE_SIGACTION 1 #define HAVE_SIGNAL_H 1 -#define HAVE_SIG_ATOMIC_T 1 #ifdef MACOS_SSL_SUPPORT # define USE_OPENSSL 1 diff --git a/lib/config-os400.h b/lib/config-os400.h index cff9c3e62..47b09465a 100644 --- a/lib/config-os400.h +++ b/lib/config-os400.h @@ -235,12 +235,6 @@ /* Define if you have the header file. */ #define HAVE_SIGNAL_H -/* Define if sig_atomic_t is an available typedef. */ -#define HAVE_SIG_ATOMIC_T - -/* Define if sig_atomic_t is already defined as volatile. */ -#undef HAVE_SIG_ATOMIC_T_VOLATILE - /* Define if you have the `socket' function. */ #define HAVE_SOCKET diff --git a/lib/config-plan9.h b/lib/config-plan9.h index 9b98a6e24..dbe9b82af 100644 --- a/lib/config-plan9.h +++ b/lib/config-plan9.h @@ -149,7 +149,6 @@ #define HAVE_SIGNAL 1 #define HAVE_SIGNAL_H 1 #define HAVE_SIGSETJMP 1 -#define HAVE_SIG_ATOMIC_T 1 #define HAVE_SOCKADDR_IN6_SIN6_SCOPE_ID 1 #define HAVE_SOCKET 1 #define HAVE_SSL_GET_SHUTDOWN 1 diff --git a/lib/config-riscos.h b/lib/config-riscos.h index 0535137be..6c6ff45ea 100644 --- a/lib/config-riscos.h +++ b/lib/config-riscos.h @@ -227,12 +227,6 @@ /* Define if you have the header file. */ #define HAVE_SIGNAL_H -/* Define if sig_atomic_t is an available typedef. */ -#define HAVE_SIG_ATOMIC_T - -/* Define if sig_atomic_t is already defined as volatile. */ -#undef HAVE_SIG_ATOMIC_T_VOLATILE - /* Define if you have the `socket' function. */ #define HAVE_SOCKET diff --git a/lib/config-tpf.h b/lib/config-tpf.h index ab29bfccc..0562ec91e 100644 --- a/lib/config-tpf.h +++ b/lib/config-tpf.h @@ -366,12 +366,6 @@ /* Define to 1 if you have the header file. */ #define HAVE_SIGNAL_H 1 -/* Define to 1 if sig_atomic_t is an available typedef. */ -#define HAVE_SIG_ATOMIC_T 1 - -/* Define to 1 if sig_atomic_t is already defined as volatile. */ -/* #undef HAVE_SIG_ATOMIC_T_VOLATILE */ - /* If you have sigsetjmp */ /* #undef HAVE_SIGSETJMP */ diff --git a/lib/config-vxworks.h b/lib/config-vxworks.h index 22d2b964a..042e67ee9 100644 --- a/lib/config-vxworks.h +++ b/lib/config-vxworks.h @@ -445,12 +445,6 @@ /* Define to 1 if you have the sigsetjmp function or macro. */ /* #undef HAVE_SIGSETJMP */ -/* Define to 1 if sig_atomic_t is an available typedef. */ -#define HAVE_SIG_ATOMIC_T 1 - -/* Define to 1 if sig_atomic_t is already defined as volatile. */ -/* #undef HAVE_SIG_ATOMIC_T_VOLATILE */ - /* Define to 1 if struct sockaddr_in6 has the sin6_scope_id member */ #define HAVE_SOCKADDR_IN6_SIN6_SCOPE_ID 1 diff --git a/lib/config-win32.h b/lib/config-win32.h index 244e5ae72..b6a6ced59 100644 --- a/lib/config-win32.h +++ b/lib/config-win32.h @@ -149,9 +149,6 @@ /* OTHER HEADER INFO */ /* ---------------------------------------------------------------- */ -/* Define if sig_atomic_t is an available typedef. */ -#define HAVE_SIG_ATOMIC_T 1 - /* Define if you have the ANSI C header files. */ #define STDC_HEADERS 1 diff --git a/lib/config-win32ce.h b/lib/config-win32ce.h index f3f02e720..2c3ed4f0e 100644 --- a/lib/config-win32ce.h +++ b/lib/config-win32ce.h @@ -123,9 +123,6 @@ /* OTHER HEADER INFO */ /* ---------------------------------------------------------------- */ -/* Define if sig_atomic_t is an available typedef. */ -#define HAVE_SIG_ATOMIC_T 1 - /* Define if you have the ANSI C header files. */ #define STDC_HEADERS 1 diff --git a/lib/curl_config.h.cmake b/lib/curl_config.h.cmake index fa4f19c74..89e11e18a 100644 --- a/lib/curl_config.h.cmake +++ b/lib/curl_config.h.cmake @@ -521,12 +521,6 @@ /* Define to 1 if you have the sigsetjmp function or macro. */ #cmakedefine HAVE_SIGSETJMP 1 -/* Define to 1 if sig_atomic_t is an available typedef. */ -#cmakedefine HAVE_SIG_ATOMIC_T 1 - -/* Define to 1 if sig_atomic_t is already defined as volatile. */ -#cmakedefine HAVE_SIG_ATOMIC_T_VOLATILE 1 - /* Define to 1 if struct sockaddr_in6 has the sin6_scope_id member */ #cmakedefine HAVE_SOCKADDR_IN6_SIN6_SCOPE_ID 1 diff --git a/lib/curl_setup_once.h b/lib/curl_setup_once.h index 22d0a063e..38018d23c 100644 --- a/lib/curl_setup_once.h +++ b/lib/curl_setup_once.h @@ -323,26 +323,6 @@ struct timeval { #include "curl_ctype.h" -/* - * Typedef to 'int' if sig_atomic_t is not an available 'typedefed' type. - */ - -#ifndef HAVE_SIG_ATOMIC_T -typedef int sig_atomic_t; -#define HAVE_SIG_ATOMIC_T -#endif - - -/* - * Convenience SIG_ATOMIC_T definition - */ - -#ifdef HAVE_SIG_ATOMIC_T_VOLATILE -#define SIG_ATOMIC_T static sig_atomic_t -#else -#define SIG_ATOMIC_T static volatile sig_atomic_t -#endif - /* * Macro used to include code only in debug builds. -- cgit v1.2.1