build: delete checks for C89 standard headers

Delete checks and guards for standard C89 headers and assume these are
available: `stdio.h`, `string.h`, `time.h`, `setjmp.h`, `stdlib.h`,
`stddef.h`, `signal.h`.

Some of these we already used unconditionally, some others we only used
for feature checks.

Follow-up to 9c7165e96a3a9a2d0b7059c87c699b5ca8cdae93 #11918 (for `stdio.h` in CMake)

Closes #11940

diff --git a/CMake/OtherTests.cmake b/CMake/OtherTests.cmake
index 762e6d1a5eff881f31591ca43d5a4702209ad5ff..b1dd2574c4eff28148af32bdff5b96b4ba598992 100644 (file)
--- a/CMake/OtherTests.cmake
+++ b/CMake/OtherTests.cmake
@@ -58,9 +58,9 @@ check_c_source_compiles("${_source_epilogue}
 if(NOT HAVE_WINDOWS_H)
   add_header_include(HAVE_SYS_TIME_H "sys/time.h")
   add_header_include(TIME_WITH_SYS_TIME "time.h")
-  add_header_include(HAVE_TIME_H "time.h")
 endif()
 check_c_source_compiles("${_source_epilogue}
+#include <time.h>
 int main(void) {
   struct timeval ts;
   ts.tv_sec  = 0;

diff --git a/CMake/Platforms/WindowsCache.cmake b/CMake/Platforms/WindowsCache.cmake
index 6a8756623f3d7cad955b362d3caaa4068f2837b7..645138351676fb4a7807f0118e0c896a0138d86e 100644 (file)
--- a/CMake/Platforms/WindowsCache.cmake
+++ b/CMake/Platforms/WindowsCache.cmake
@@ -63,11 +63,7 @@ if(NOT UNIX)
     set(HAVE_IOCTL_SIOCGIFADDR 0)
     set(HAVE_POLL_H 0)
     set(HAVE_PWD_H 0)
-    set(HAVE_SETJMP_H 1)
-    set(HAVE_SIGNAL_H 1)
-    set(HAVE_STDLIB_H 1)
     set(HAVE_STRINGS_H 0)
-    set(HAVE_STRING_H 1)
     set(HAVE_SYS_FILIO_H 0)
     set(HAVE_SYS_IOCTL_H 0)
     set(HAVE_SYS_PARAM_H 0)
@@ -83,7 +79,6 @@ if(NOT UNIX)
     set(HAVE_SYS_UTIME_H 1)
     set(HAVE_TERMIOS_H 0)
     set(HAVE_TERMIO_H 0)
-    set(HAVE_TIME_H 1)
     set(HAVE_UTIME_H 0)
 
     set(HAVE_SOCKET 1)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 84774dc1db043ef432bf15f5e9c2f46de9f59f9a..557ab026208a0272f41e94833ecff594760ca5b0 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -995,6 +995,11 @@ if(CURL_CA_PATH_SET AND NOT USE_OPENSSL AND NOT USE_MBEDTLS)
           "Set CURL_CA_PATH=none or enable one of those TLS backends.")
 endif()
 
+# TODO: offload these headers to the specific tests where they are needed.
+list(APPEND CURL_INCLUDES "string.h")
+list(APPEND CURL_INCLUDES "stdlib.h")
+list(APPEND CURL_INCLUDES "stddef.h")
+
 # Check for header files
 if(NOT UNIX)
   check_include_file_concat("windows.h"      HAVE_WINDOWS_H)
@@ -1032,14 +1037,9 @@ check_include_file("linux/tcp.h"      HAVE_LINUX_TCP_H)
 
 check_include_file_concat("poll.h"           HAVE_POLL_H)
 check_include_file_concat("pwd.h"            HAVE_PWD_H)
-check_include_file_concat("setjmp.h"         HAVE_SETJMP_H)
-check_include_file_concat("signal.h"         HAVE_SIGNAL_H)
 check_include_file_concat("stdatomic.h"      HAVE_STDATOMIC_H)
 check_include_file_concat("stdbool.h"        HAVE_STDBOOL_H)
 check_include_file_concat("stdint.h"         HAVE_STDINT_H)
-check_include_file_concat("stdio.h"          HAVE_STDIO_H)
-check_include_file_concat("stdlib.h"         HAVE_STDLIB_H)
-check_include_file_concat("string.h"         HAVE_STRING_H)
 check_include_file_concat("strings.h"        HAVE_STRINGS_H)
 check_include_file_concat("stropts.h"        HAVE_STROPTS_H)
 check_include_file_concat("termio.h"         HAVE_TERMIO_H)
@@ -1048,8 +1048,6 @@ check_include_file_concat("time.h"           HAVE_TIME_H)
 check_include_file_concat("unistd.h"         HAVE_UNISTD_H)
 check_include_file_concat("utime.h"          HAVE_UTIME_H)
 
-check_include_file_concat("stddef.h"         HAVE_STDDEF_H)
-
 check_type_size(size_t  SIZEOF_SIZE_T)
 check_type_size(ssize_t  SIZEOF_SSIZE_T)
 check_type_size("long long"  SIZEOF_LONG_LONG)
@@ -1123,8 +1121,8 @@ endif()
 check_symbol_exists(freeaddrinfo   "${CURL_INCLUDES}" HAVE_FREEADDRINFO)
 check_symbol_exists(pipe           "${CURL_INCLUDES}" HAVE_PIPE)
 check_symbol_exists(ftruncate      "${CURL_INCLUDES}" HAVE_FTRUNCATE)
-check_symbol_exists(fseeko         "${CURL_INCLUDES}" HAVE_FSEEKO)
-check_symbol_exists(_fseeki64      "${CURL_INCLUDES}" HAVE__FSEEKI64)
+check_symbol_exists(fseeko         "${CURL_INCLUDES};stdio.h" HAVE_FSEEKO)
+check_symbol_exists(_fseeki64      "${CURL_INCLUDES};stdio.h" HAVE__FSEEKI64)
 check_symbol_exists(getpeername    "${CURL_INCLUDES}" HAVE_GETPEERNAME)
 check_symbol_exists(getsockname    "${CURL_INCLUDES}" HAVE_GETSOCKNAME)
 check_symbol_exists(if_nametoindex "${CURL_INCLUDES}" HAVE_IF_NAMETOINDEX)
@@ -1163,16 +1161,12 @@ set(CMAKE_EXTRA_INCLUDE_FILES   "")
 
 # sigaction and sigsetjmp are special. Use special mechanism for
 # detecting those, but only if previous attempt failed.
-if(HAVE_SIGNAL_H)
-  check_symbol_exists(sigaction "signal.h" HAVE_SIGACTION)
-endif()
+check_symbol_exists(sigaction "signal.h" HAVE_SIGACTION)
 
 if(NOT HAVE_SIGSETJMP)
-  if(HAVE_SETJMP_H)
-    check_symbol_exists(sigsetjmp "setjmp.h" HAVE_MACRO_SIGSETJMP)
-    if(HAVE_MACRO_SIGSETJMP)
-      set(HAVE_SIGSETJMP 1)
-    endif()
+  check_symbol_exists(sigsetjmp "setjmp.h" HAVE_MACRO_SIGSETJMP)
+  if(HAVE_MACRO_SIGSETJMP)
+    set(HAVE_SIGSETJMP 1)
   endif()
 endif()
 

diff --git a/acinclude.m4 b/acinclude.m4
index 81a1c1d0def5e2209b85b8c40aef9d8e73360201..0a5f80979086147621517b8faed46c770721f827 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -1142,9 +1142,7 @@ AC_DEFUN([CURL_CHECK_LIBS_CLOCK_GETTIME_MONOTONIC], [
       AC_MSG_CHECKING([if monotonic clock_gettime works])
       CURL_RUN_IFELSE([
         AC_LANG_PROGRAM([[
-#ifdef HAVE_STDLIB_H
 #include <stdlib.h>
-#endif
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
 #endif

diff --git a/lib/config-amigaos.h b/lib/config-amigaos.h
index a6a518abb325e6e7252ec73f6c88e4a88512fcff..f5d020253d4bb9d2527e08ddaf9fdcf3e3bbadbf 100644 (file)
--- a/lib/config-amigaos.h
+++ b/lib/config-amigaos.h
@@ -41,15 +41,12 @@
 #define HAVE_NET_IF_H 1
 #define HAVE_PWD_H 1
 #define HAVE_SELECT 1
-#define HAVE_SETJMP_H 1
 #define HAVE_SIGNAL 1
-#define HAVE_SIGNAL_H 1
 #define HAVE_SOCKET 1
 #define HAVE_STRCASECMP 1
 #define HAVE_STRDUP 1
 #define HAVE_STRICMP 1
 #define HAVE_STRINGS_H 1
-#define HAVE_STRING_H 1
 #define HAVE_STRUCT_TIMEVAL 1
 #define HAVE_SYS_PARAM_H 1
 #define HAVE_SYS_SOCKET_H 1
@@ -57,7 +54,6 @@
 #define HAVE_SYS_STAT_H 1
 #define HAVE_SYS_TIME_H 1
 #define HAVE_SYS_TYPES_H 1
-#define HAVE_TIME_H 1
 #define HAVE_UNISTD_H 1
 #define HAVE_UTIME 1
 #define HAVE_UTIME_H 1

diff --git a/lib/config-dos.h b/lib/config-dos.h
index 05c1a81407d3f4339c8bac3ee5244438832ef5f8..5c646bb5ed35d36135ba3082fe5a5fc398b10950 100644 (file)
--- a/lib/config-dos.h
+++ b/lib/config-dos.h
@@ -61,7 +61,6 @@
 #define HAVE_RECV              1
 #define HAVE_SELECT            1
 #define HAVE_SEND              1
-#define HAVE_SETJMP_H          1
 #define HAVE_SETLOCALE         1
 #define HAVE_SETMODE           1
 #define HAVE_SIGNAL            1
@@ -74,7 +73,6 @@
 #define HAVE_SYS_SOCKET_H      1
 #define HAVE_SYS_STAT_H        1
 #define HAVE_SYS_TYPES_H       1
-#define HAVE_TIME_H            1
 #define HAVE_UNISTD_H          1
 
 #define NEED_MALLOC_H          1

diff --git a/lib/config-mac.h b/lib/config-mac.h
index ff6fdb25ae7a1c7632eb1aea9dae77f635875f4b..5429fbee48b52a97b4cf9b3538312f66663c55d7 100644 (file)
--- a/lib/config-mac.h
+++ b/lib/config-mac.h
@@ -52,8 +52,6 @@
 #define HAVE_GETTIMEOFDAY       1
 #define HAVE_FCNTL_H            1
 #define HAVE_SYS_STAT_H         1
-#define HAVE_STDLIB_H           1
-#define HAVE_TIME_H             1
 #define HAVE_UTIME_H            1
 #define HAVE_SYS_TIME_H         1
 #define HAVE_SYS_UTIME_H        1
@@ -69,7 +67,6 @@
 #define HAVE_STRUCT_TIMEVAL     1
 
 #define HAVE_SIGACTION          1
-#define HAVE_SIGNAL_H           1
 
 #ifdef MACOS_SSL_SUPPORT
 #  define USE_OPENSSL           1

diff --git a/lib/config-os400.h b/lib/config-os400.h
index 2d0291d16ddf98dfb028f33479a10929732a29f4..04f7752936ca6b08d6813342d1c0ed318aee8654 100644 (file)
--- a/lib/config-os400.h
+++ b/lib/config-os400.h
@@ -149,18 +149,12 @@
 /* Define if you have the `signal' function. */
 #undef HAVE_SIGNAL
 
-/* Define if you have the <signal.h> header file. */
-#define HAVE_SIGNAL_H
-
 /* Define if you have the `socket' function. */
 #define HAVE_SOCKET
 
 /* Define if you have the <stdint.h> header file. */
 #undef HAVE_STDINT_H
 
-/* Define if you have the <stdlib.h> header file. */
-#define HAVE_STDLIB_H
-
 
 /* The following define is needed on OS400 to enable strcmpi(), stricmp() and
    strdup(). */
@@ -181,9 +175,6 @@
 /* Define if you have the <strings.h> header file. */
 #define HAVE_STRINGS_H
 
-/* Define if you have the <string.h> header file. */
-#define HAVE_STRING_H
-
 /* Define if you have the <stropts.h> header file. */
 #undef HAVE_STROPTS_H
 
@@ -226,9 +217,6 @@
 /* Define if you have the <termio.h> header file. */
 #undef HAVE_TERMIO_H
 
-/* Define if you have the <time.h> header file. */
-#define HAVE_TIME_H
-
 /* Define if you have the <unistd.h> header file. */
 #define HAVE_UNISTD_H
 

diff --git a/lib/config-plan9.h b/lib/config-plan9.h
index 54f89b06cfbb774a4e5a89bc1de0d9581022e152..60e3402eb58c354cf9ad6ee24cb0562bf55a08b1 100644 (file)
--- a/lib/config-plan9.h
+++ b/lib/config-plan9.h
@@ -108,22 +108,18 @@
 #define HAVE_POLL_FINE 1
 #define HAVE_POLL_H 1
 #define HAVE_PTHREAD_H 1
-#define HAVE_SETJMP_H 1
 #define HAVE_SETLOCALE 1
 
 #define HAVE_SIGACTION 1
 #define HAVE_SIGNAL 1
-#define HAVE_SIGNAL_H 1
 #define HAVE_SIGSETJMP 1
 #define HAVE_SOCKADDR_IN6_SIN6_SCOPE_ID 1
 #define HAVE_SOCKET 1
 #define HAVE_SSL_GET_SHUTDOWN 1
 #define HAVE_STDBOOL_H 1
 #define HAVE_STDINT_H 1
-#define HAVE_STDLIB_H 1
 #define HAVE_STRCASECMP 1
 #define HAVE_STRDUP 1
-#define HAVE_STRING_H 1
 #define HAVE_STRTOK_R 1
 #define HAVE_STRTOLL 1
 #define HAVE_STRUCT_TIMEVAL 1
@@ -136,7 +132,6 @@
 #define HAVE_SYS_TYPES_H 1
 #define HAVE_SYS_UN_H 1
 #define HAVE_TERMIOS_H 1
-#define HAVE_TIME_H 1
 #define HAVE_UNISTD_H 1
 #define HAVE_UTIME 1
 #define HAVE_UTIME_H 1

diff --git a/lib/config-riscos.h b/lib/config-riscos.h
index 94946187d8c3f210a094251d923b7505af6fb866..e3834b66d305d0686ad458818865f05e13102f8c 100644 (file)
--- a/lib/config-riscos.h
+++ b/lib/config-riscos.h
@@ -141,18 +141,12 @@
 /* Define if you have the `signal' function. */
 #define HAVE_SIGNAL
 
-/* Define if you have the <signal.h> header file. */
-#define HAVE_SIGNAL_H
-
 /* Define if you have the `socket' function. */
 #define HAVE_SOCKET
 
 /* Define if you have the <stdint.h> header file. */
 #undef HAVE_STDINT_H
 
-/* Define if you have the <stdlib.h> header file. */
-#define HAVE_STDLIB_H
-
 /* Define if you have the `strcasecmp' function. */
 #undef HAVE_STRCASECMP
 
@@ -168,9 +162,6 @@
 /* Define if you have the <strings.h> header file. */
 #undef HAVE_STRINGS_H
 
-/* Define if you have the <string.h> header file. */
-#define HAVE_STRING_H
-
 /* Define if you have the `strtok_r' function. */
 #undef HAVE_STRTOK_R
 
@@ -204,9 +195,6 @@
 /* Define if you have the <termio.h> header file. */
 #undef HAVE_TERMIO_H
 
-/* Define if you have the <time.h> header file. */
-#undef HAVE_TIME_H
-
 /* Define if you have the <unistd.h> header file. */
 #define HAVE_UNISTD_H
 

diff --git a/lib/config-win32.h b/lib/config-win32.h
index f8f7b1ba34863dc07f49377dd77e568fcb69ee8a..5534bb8fc020cac1fd19d4b396f48e23fb5de3c6 100644 (file)
--- a/lib/config-win32.h
+++ b/lib/config-win32.h
@@ -66,17 +66,11 @@
 /* Define if you have the <netinet/in.h> header file. */
 /* #define HAVE_NETINET_IN_H 1 */
 
-/* Define if you have the <signal.h> header file. */
-#define HAVE_SIGNAL_H 1
-
 /* Define to 1 if you have the <stdbool.h> header file. */
 #if (defined(_MSC_VER) && (_MSC_VER >= 1800)) || defined(__MINGW32__)
 #define HAVE_STDBOOL_H 1
 #endif
 
-/* Define if you have the <stdlib.h> header file. */
-#define HAVE_STDLIB_H 1
-
 /* Define if you have the <sys/param.h> header file. */
 /* #define HAVE_SYS_PARAM_H 1 */
 
@@ -109,9 +103,6 @@
 /* Define if you have the <termios.h> header file. */
 /* #define HAVE_TERMIOS_H 1 */
 
-/* Define if you have the <time.h> header file. */
-#define HAVE_TIME_H 1
-
 /* Define if you have the <unistd.h> header file. */
 #if defined(__MINGW32__) || defined(__LCC__) || defined(__POCC__)
 #define HAVE_UNISTD_H 1
@@ -130,12 +121,6 @@
 #define HAVE_WS2TCPIP_H 1
 #endif
 
-/* Define to 1 if you have the <setjmp.h> header file. */
-#define HAVE_SETJMP_H 1
-
-/* Define to 1 if you have the <string.h> header file. */
-#define HAVE_STRING_H 1
-
 /* Define to 1 if you have the <libgen.h> header file. */
 #if defined(__MINGW32__)
 #define HAVE_LIBGEN_H 1

diff --git a/lib/config-win32ce.h b/lib/config-win32ce.h
index 2f9a530524259323267244bd2f5eebdf4c302d52..1a34239006c627b1c5affc49938f795752adf911 100644 (file)
--- a/lib/config-win32ce.h
+++ b/lib/config-win32ce.h
@@ -50,12 +50,6 @@
 /* Define if you have the <netinet/in.h> header file.  */
 /* #define HAVE_NETINET_IN_H 1 */
 
-/* Define if you have the <signal.h> header file. */
-#define HAVE_SIGNAL_H 1
-
-/* Define if you have the <stdlib.h> header file.  */
-#define HAVE_STDLIB_H 1
-
 /* Define if you have the <sys/param.h> header file.  */
 /* #define HAVE_SYS_PARAM_H 1 */
 
@@ -86,9 +80,6 @@
 /* Define if you have the <termios.h> header file.  */
 /* #define HAVE_TERMIOS_H 1 */
 
-/* Define if you have the <time.h> header file.  */
-#define HAVE_TIME_H 1
-
 /* Define if you have the <unistd.h> header file.  */
 #if defined(__MINGW32__) || defined(__LCC__)
 #define HAVE_UNISTD_H 1

diff --git a/lib/curl_config.h.cmake b/lib/curl_config.h.cmake
index 328a77d733ee708c6590a91796feadc755ae8bf7..7aefe428dd5f61643b0f7bfa026afee5146b2a02 100644 (file)
--- a/lib/curl_config.h.cmake
+++ b/lib/curl_config.h.cmake
@@ -430,9 +430,6 @@
 /* fsetxattr() takes 6 args */
 #cmakedefine HAVE_FSETXATTR_6 1
 
-/* Define to 1 if you have the <setjmp.h> header file. */
-#cmakedefine HAVE_SETJMP_H 1
-
 /* Define to 1 if you have the `setlocale' function. */
 #cmakedefine HAVE_SETLOCALE 1
 
@@ -454,9 +451,6 @@
 /* Define to 1 if you have the signal function. */
 #cmakedefine HAVE_SIGNAL 1
 
-/* Define to 1 if you have the <signal.h> header file. */
-#cmakedefine HAVE_SIGNAL_H 1
-
 /* Define to 1 if you have the sigsetjmp function or macro. */
 #cmakedefine HAVE_SIGSETJMP 1
 
@@ -481,9 +475,6 @@
 /* Define to 1 if you have the <stdint.h> header file. */
 #cmakedefine HAVE_STDINT_H 1
 
-/* Define to 1 if you have the <stdlib.h> header file. */
-#cmakedefine HAVE_STDLIB_H 1
-
 /* Define to 1 if you have the strcasecmp function. */
 #cmakedefine HAVE_STRCASECMP 1
 
@@ -502,9 +493,6 @@
 /* Define to 1 if you have the <strings.h> header file. */
 #cmakedefine HAVE_STRINGS_H 1
 
-/* Define to 1 if you have the <string.h> header file. */
-#cmakedefine HAVE_STRING_H 1
-
 /* Define to 1 if you have the <stropts.h> header file. */
 #cmakedefine HAVE_STROPTS_H 1
 
@@ -565,9 +553,6 @@
 /* Define to 1 if you have the <termio.h> header file. */
 #cmakedefine HAVE_TERMIO_H 1
 
-/* Define to 1 if you have the <time.h> header file. */
-#cmakedefine HAVE_TIME_H 1
-
 /* Define to 1 if you have the <unistd.h> header file. */
 #cmakedefine HAVE_UNISTD_H 1
 

diff --git a/lib/curl_memrchr.h b/lib/curl_memrchr.h
index a1a4ba092731eb37de44a5cfff6f601ccf1a7f12..45bb38c68e54f6aa0939429ab993afa01b80b6b7 100644 (file)
--- a/lib/curl_memrchr.h
+++ b/lib/curl_memrchr.h
@@ -28,9 +28,7 @@
 
 #ifdef HAVE_MEMRCHR
 
-#ifdef HAVE_STRING_H
-#  include <string.h>
-#endif
+#include <string.h>
 #ifdef HAVE_STRINGS_H
 #  include <strings.h>
 #endif

diff --git a/lib/curl_ntlm_wb.c b/lib/curl_ntlm_wb.c
index a10e2a1b09061b1e07c172e14fc6f76c88a21be2..aa7bea75e377cf868ac4fd6f91102903197bf76a 100644 (file)
--- a/lib/curl_ntlm_wb.c
+++ b/lib/curl_ntlm_wb.c
@@ -39,9 +39,7 @@
 #ifdef HAVE_SYS_WAIT_H
 #include <sys/wait.h>
 #endif
-#ifdef HAVE_SIGNAL_H
 #include <signal.h>
-#endif
 #ifdef HAVE_PWD_H
 #include <pwd.h>
 #endif

diff --git a/lib/hostip.c b/lib/hostip.c
index acb4b5140b5e5f4bfd02103ecf06fffc07b20685..3cd9a65c50bd3cc58afb281d527ba29575264935 100644 (file)
--- a/lib/hostip.c
+++ b/lib/hostip.c
@@ -41,12 +41,8 @@
 #include <inet.h>
 #endif
 
-#ifdef HAVE_SETJMP_H
 #include <setjmp.h>
-#endif
-#ifdef HAVE_SIGNAL_H
 #include <signal.h>
-#endif
 
 #include "urldata.h"
 #include "sendf.h"

diff --git a/lib/hostip.h b/lib/hostip.h
index 06d086727779b1c262bf786eb38dc2f5b694cdda..b68f539b2df94e6f2b4c490242e096da53a238e9 100644 (file)
--- a/lib/hostip.h
+++ b/lib/hostip.h
@@ -30,9 +30,7 @@
 #include "timeval.h" /* for timediff_t */
 #include "asyn.h"
 
-#ifdef HAVE_SETJMP_H
 #include <setjmp.h>
-#endif
 
 /* Allocate enough memory to hold the full name information structs and
  * everything. OSF1 is known to require at least 8872 bytes. The buffer

diff --git a/lib/sigpipe.h b/lib/sigpipe.h
index 48761ad0fde40f9e2edcceb3a5bf2a80efa2ab10..9b29403c28f67cb2e1769fa30f1b88129a11ba98 100644 (file)
--- a/lib/sigpipe.h
+++ b/lib/sigpipe.h
@@ -25,7 +25,7 @@
  ***************************************************************************/
 #include "curl_setup.h"
 
-#if defined(HAVE_SIGNAL_H) && defined(HAVE_SIGACTION) &&        \
+#if defined(HAVE_SIGACTION) &&        \
   (defined(USE_OPENSSL) || defined(USE_MBEDTLS) || defined(USE_WOLFSSL))
 #include <signal.h>
 

diff --git a/lib/transfer.c b/lib/transfer.c
index 4c9ff0aa845add791af5f4e02d7131a9fcd27647..b9ce2b513158da32c7fcd917a287aa750a145dc4 100644 (file)
--- a/lib/transfer.c
+++ b/lib/transfer.c
@@ -40,9 +40,7 @@
 #ifdef HAVE_SYS_IOCTL_H
 #include <sys/ioctl.h>
 #endif
-#ifdef HAVE_SIGNAL_H
 #include <signal.h>
-#endif
 
 #ifdef HAVE_SYS_PARAM_H
 #include <sys/param.h>

diff --git a/m4/curl-functions.m4 b/m4/curl-functions.m4
index bd2ebbd019246c033c655e7243bfb375d32eb4a5..1c96fb3bf07aa6804b29c646e17fbb7b669d6468 100644 (file)
--- a/m4/curl-functions.m4
+++ b/m4/curl-functions.m4
@@ -214,12 +214,10 @@ curl_includes_setjmp="\
 #ifdef HAVE_SYS_TYPES_H
 #  include <sys/types.h>
 #endif
-#ifdef HAVE_SETJMP_H
-#  include <setjmp.h>
-#endif
+include <setjmp.h>
 /* includes end */"
   AC_CHECK_HEADERS(
-    sys/types.h setjmp.h,
+    sys/types.h,
     [], [], [$curl_includes_setjmp])
 ])
 
@@ -235,12 +233,10 @@ curl_includes_signal="\
 #ifdef HAVE_SYS_TYPES_H
 #  include <sys/types.h>
 #endif
-#ifdef HAVE_SIGNAL_H
-#  include <signal.h>
-#endif
+include <signal.h>
 /* includes end */"
   AC_CHECK_HEADERS(
-    sys/types.h signal.h,
+    sys/types.h,
     [], [], [$curl_includes_signal])
 ])
 
@@ -277,12 +273,10 @@ curl_includes_stdlib="\
 #ifdef HAVE_SYS_TYPES_H
 #  include <sys/types.h>
 #endif
-#ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-#endif
+include <stdlib.h>
 /* includes end */"
   AC_CHECK_HEADERS(
-    sys/types.h stdlib.h,
+    sys/types.h,
     [], [], [$curl_includes_stdlib])
 ])
 
@@ -298,15 +292,13 @@ curl_includes_string="\
 #ifdef HAVE_SYS_TYPES_H
 #  include <sys/types.h>
 #endif
-#ifdef HAVE_STRING_H
-#  include <string.h>
-#endif
+#include <string.h>
 #ifdef HAVE_STRINGS_H
 #  include <strings.h>
 #endif
 /* includes end */"
   AC_CHECK_HEADERS(
-    sys/types.h string.h strings.h,
+    sys/types.h strings.h,
     [], [], [$curl_includes_string])
 ])
 

diff --git a/src/tool_main.c b/src/tool_main.c
index 5c904e86c7d89f13d6d13d26f212dd88cf66958f..2f132e2d29c52453257b94f774704ff6c920eb82 100644 (file)
--- a/src/tool_main.c
+++ b/src/tool_main.c
@@ -29,9 +29,7 @@
 #include <tchar.h>
 #endif
 
-#ifdef HAVE_SIGNAL_H
 #include <signal.h>
-#endif
 
 #ifdef HAVE_FCNTL_H
 #include <fcntl.h>

diff --git a/tests/server/mqttd.c b/tests/server/mqttd.c
index e6e5cf06351d43e9113f73755ccad312391018bf..55ef02cdb6b699ead854324da4b2844894ad1263 100644 (file)
--- a/tests/server/mqttd.c
+++ b/tests/server/mqttd.c
@@ -40,9 +40,7 @@
 
 /* based on sockfilt.c */
 
-#ifdef HAVE_SIGNAL_H
 #include <signal.h>
-#endif
 #ifdef HAVE_NETINET_IN_H
 #include <netinet/in.h>
 #endif

diff --git a/tests/server/resolve.c b/tests/server/resolve.c
index 37432e4c85436b13aba0be05a17564aa828e2be7..221df64b017acbcb5d092b6bd060045304e8f3ca 100644 (file)
--- a/tests/server/resolve.c
+++ b/tests/server/resolve.c
@@ -33,9 +33,7 @@
  *
  */
 
-#ifdef HAVE_SIGNAL_H
 #include <signal.h>
-#endif
 #ifdef HAVE_NETINET_IN_H
 #include <netinet/in.h>
 #endif

diff --git a/tests/server/rtspd.c b/tests/server/rtspd.c
index cf080ecd05d2202319009772f87d7f83a33fb816..47bd32e74e71c0d3ff6fc6ff0aba43f278680802 100644 (file)
--- a/tests/server/rtspd.c
+++ b/tests/server/rtspd.c
@@ -29,9 +29,7 @@
  * This source file was started based on curl's HTTP test suite server.
  */
 
-#ifdef HAVE_SIGNAL_H
 #include <signal.h>
-#endif
 #ifdef HAVE_NETINET_IN_H
 #include <netinet/in.h>
 #endif

diff --git a/tests/server/sockfilt.c b/tests/server/sockfilt.c
index d47f3b2ad0f4199bfbdca3b7dd5ae35b06d42f00..473b651f7ddf1440c07d1dd80e4517e0bfec3287 100644 (file)
--- a/tests/server/sockfilt.c
+++ b/tests/server/sockfilt.c
@@ -85,9 +85,7 @@
  * it!
  */
 
-#ifdef HAVE_SIGNAL_H
 #include <signal.h>
-#endif
 #ifdef HAVE_NETINET_IN_H
 #include <netinet/in.h>
 #endif

diff --git a/tests/server/socksd.c b/tests/server/socksd.c
index e53001d320ecd0bfb52f7f1c14a058223631dc64..cf9a14fd826e408f04c26db34cf5b10bd2902597 100644 (file)
--- a/tests/server/socksd.c
+++ b/tests/server/socksd.c
@@ -57,9 +57,7 @@
 
 /* based on sockfilt.c */
 
-#ifdef HAVE_SIGNAL_H
 #include <signal.h>
-#endif
 #ifdef HAVE_NETINET_IN_H
 #include <netinet/in.h>
 #endif

diff --git a/tests/server/sws.c b/tests/server/sws.c
index 91b4d5a0e950da7563b58ffd15b69a7949a4b26f..bea3191a2a61e9c245055e84e8c6e70eb8a0cac2 100644 (file)
--- a/tests/server/sws.c
+++ b/tests/server/sws.c
@@ -30,9 +30,7 @@
 
  */
 
-#ifdef HAVE_SIGNAL_H
 #include <signal.h>
-#endif
 #ifdef HAVE_NETINET_IN_H
 #include <netinet/in.h>
 #endif

diff --git a/tests/server/tftpd.c b/tests/server/tftpd.c
index 8db82ff2331bf753b0e3062b35edabea9d4542b2..670897c0d42ec0362f1edf56684ae480526c1547 100644 (file)
--- a/tests/server/tftpd.c
+++ b/tests/server/tftpd.c
@@ -55,9 +55,7 @@
 #ifdef HAVE_SYS_IOCTL_H
 #include <sys/ioctl.h>
 #endif
-#ifdef HAVE_SIGNAL_H
 #include <signal.h>
-#endif
 #ifdef HAVE_FCNTL_H
 #include <fcntl.h>
 #endif
@@ -75,9 +73,7 @@
 #include <sys/filio.h>
 #endif
 
-#ifdef HAVE_SETJMP_H
 #include <setjmp.h>
-#endif
 
 #ifdef HAVE_PWD_H
 #include <pwd.h>

diff --git a/tests/server/util.c b/tests/server/util.c
index 435cf618353bd0fdbad1ecbe1921b4529a3afc0a..19faa261514cf85fd6181d5a32ce06abf6b5b04a 100644 (file)
--- a/tests/server/util.c
+++ b/tests/server/util.c
@@ -23,9 +23,7 @@
  ***************************************************************************/
 #include "server_setup.h"
 
-#ifdef HAVE_SIGNAL_H
 #include <signal.h>
-#endif
 #ifdef HAVE_NETINET_IN_H
 #include <netinet/in.h>
 #endif

diff --git a/tests/unit/unit2600.c b/tests/unit/unit2600.c
index 4710d217624b6c580ca3c3e8a78044c9f673d7c6..d7b1efdd754ef9c61ba78a730fab51cee8b3d41b 100644 (file)
--- a/tests/unit/unit2600.c
+++ b/tests/unit/unit2600.c
@@ -40,12 +40,8 @@
 #include <inet.h>
 #endif
 
-#ifdef HAVE_SETJMP_H
 #include <setjmp.h>
-#endif
-#ifdef HAVE_SIGNAL_H
 #include <signal.h>
-#endif
 
 #include "urldata.h"
 #include "connect.h"