diff options
author | Jay Satiro <raysatiro@yahoo.com> | 2018-01-03 14:40:52 -0500 |
---|---|---|
committer | Jay Satiro <raysatiro@yahoo.com> | 2018-01-05 23:34:30 -0500 |
commit | 908a9a6742b1010894fae2a4a9cf797b051d6c33 (patch) | |
tree | cb5381a70d543910de2b21b7bddf69702369c7cf | |
parent | 129390a518c41739364081c8966a718f2ac347a4 (diff) |
build: remove HAVE_LIMITS_H check
.. because limits.h presence isn't optional, it's required by C89.
Ref: http://port70.net/~nsz/c/c89/c89-draft.html#2.2.4.2
Closes https://github.com/curl/curl/pull/2215
-rw-r--r-- | CMakeLists.txt | 1 | ||||
-rwxr-xr-x | configure.ac | 1 | ||||
-rw-r--r-- | lib/Makefile.netware | 1 | ||||
-rw-r--r-- | lib/asyn-ares.c | 2 | ||||
-rw-r--r-- | lib/config-dos.h | 1 | ||||
-rw-r--r-- | lib/config-symbian.h | 3 | ||||
-rw-r--r-- | lib/config-tpf.h | 3 | ||||
-rw-r--r-- | lib/config-vxworks.h | 3 | ||||
-rw-r--r-- | lib/config-win32.h | 3 | ||||
-rw-r--r-- | lib/config-win32ce.h | 3 | ||||
-rw-r--r-- | lib/curl_config.h.cmake | 3 | ||||
-rw-r--r-- | lib/parsedate.c | 2 | ||||
-rw-r--r-- | lib/security.c | 2 | ||||
-rw-r--r-- | lib/setopt.c | 2 | ||||
-rw-r--r-- | lib/ssh-libssh.c | 2 | ||||
-rw-r--r-- | lib/ssh.c | 4 | ||||
-rw-r--r-- | lib/url.c | 2 | ||||
-rw-r--r-- | lib/vtls/cyassl.c | 2 | ||||
-rw-r--r-- | lib/vtls/darwinssl.c | 2 | ||||
-rw-r--r-- | lib/vtls/gskit.c | 4 | ||||
-rw-r--r-- | lib/vtls/openssl.c | 2 | ||||
-rw-r--r-- | tests/libtest/lib1502.c | 2 | ||||
-rw-r--r-- | tests/libtest/lib518.c | 2 | ||||
-rw-r--r-- | tests/libtest/lib537.c | 2 | ||||
-rw-r--r-- | tests/libtest/lib540.c | 2 | ||||
-rw-r--r-- | tests/libtest/lib557.c | 2 | ||||
-rw-r--r-- | tests/libtest/lib591.c | 2 | ||||
-rw-r--r-- | tests/libtest/lib597.c | 2 | ||||
-rw-r--r-- | tests/libtest/libntlmconnect.c | 2 |
29 files changed, 2 insertions, 62 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 7b73b98f7..490cc19ef 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -737,7 +737,6 @@ check_include_file_concat("ifaddrs.h" HAVE_IFADDRS_H) check_include_file_concat("io.h" HAVE_IO_H) check_include_file_concat("krb.h" HAVE_KRB_H) check_include_file_concat("libgen.h" HAVE_LIBGEN_H) -check_include_file_concat("limits.h" HAVE_LIMITS_H) check_include_file_concat("locale.h" HAVE_LOCALE_H) check_include_file_concat("net/if.h" HAVE_NET_IF_H) check_include_file_concat("netdb.h" HAVE_NETDB_H) diff --git a/configure.ac b/configure.ac index 86ba842d6..5292937bb 100755 --- a/configure.ac +++ b/configure.ac @@ -3359,7 +3359,6 @@ AC_CHECK_HEADERS( assert.h \ unistd.h \ stdlib.h \ - limits.h \ arpa/inet.h \ net/if.h \ netinet/in.h \ diff --git a/lib/Makefile.netware b/lib/Makefile.netware index a4ec4c8f3..f4b6528eb 100644 --- a/lib/Makefile.netware +++ b/lib/Makefile.netware @@ -589,7 +589,6 @@ endif @echo $(DL)#define HAVE_INET_ADDR 1$(DL) >> $@ @echo $(DL)#define HAVE_IOCTL 1$(DL) >> $@ @echo $(DL)#define HAVE_IOCTL_FIONBIO 1$(DL) >> $@ - @echo $(DL)#define HAVE_LIMITS_H 1$(DL) >> $@ @echo $(DL)#define HAVE_LL 1$(DL) >> $@ @echo $(DL)#define HAVE_LOCALE_H 1$(DL) >> $@ @echo $(DL)#define HAVE_LOCALTIME_R 1$(DL) >> $@ diff --git a/lib/asyn-ares.c b/lib/asyn-ares.c index 38ede999c..aa581a49a 100644 --- a/lib/asyn-ares.c +++ b/lib/asyn-ares.c @@ -30,9 +30,7 @@ #ifdef CURLRES_ARES -#ifdef HAVE_LIMITS_H #include <limits.h> -#endif #ifdef HAVE_NETINET_IN_H #include <netinet/in.h> #endif diff --git a/lib/config-dos.h b/lib/config-dos.h index eec7af988..ff1ea1558 100644 --- a/lib/config-dos.h +++ b/lib/config-dos.h @@ -53,7 +53,6 @@ #define HAVE_IOCTL_FIONBIO 1 #define HAVE_IOCTLSOCKET 1 #define HAVE_IOCTLSOCKET_FIONBIO 1 -#define HAVE_LIMITS_H 1 #define HAVE_LOCALE_H 1 #define HAVE_LONGLONG 1 #define HAVE_MEMORY_H 1 diff --git a/lib/config-symbian.h b/lib/config-symbian.h index 92983d242..d23de3325 100644 --- a/lib/config-symbian.h +++ b/lib/config-symbian.h @@ -318,9 +318,6 @@ /* Define to 1 if you have the `ssl' library (-lssl). */ /*#define HAVE_LIBSSL 1*/ -/* Define to 1 if you have the <limits.h> header file. */ -#define HAVE_LIMITS_H 1 - /* if your compiler supports LL */ #define HAVE_LL 1 diff --git a/lib/config-tpf.h b/lib/config-tpf.h index d1eb3d906..778d9833f 100644 --- a/lib/config-tpf.h +++ b/lib/config-tpf.h @@ -284,9 +284,6 @@ /* if zlib is available */ /* #undef HAVE_LIBZ */ -/* Define to 1 if you have the <limits.h> header file. */ -#define HAVE_LIMITS_H 1 - /* if your compiler supports LL */ #define HAVE_LL 1 diff --git a/lib/config-vxworks.h b/lib/config-vxworks.h index 780a4a225..19f2d2354 100644 --- a/lib/config-vxworks.h +++ b/lib/config-vxworks.h @@ -384,9 +384,6 @@ /* if zlib is available */ #define HAVE_LIBZ 1 -/* Define to 1 if you have the <limits.h> header file. */ -#define HAVE_LIMITS_H 1 - /* if your compiler supports LL */ #define HAVE_LL 1 diff --git a/lib/config-win32.h b/lib/config-win32.h index 309f701a9..3e5567df2 100644 --- a/lib/config-win32.h +++ b/lib/config-win32.h @@ -61,9 +61,6 @@ /* Define if you have the <io.h> header file. */ #define HAVE_IO_H 1 -/* Define if you have the <limits.h> header file. */ -#define HAVE_LIMITS_H 1 - /* Define if you have the <locale.h> header file. */ #define HAVE_LOCALE_H 1 diff --git a/lib/config-win32ce.h b/lib/config-win32ce.h index 28a15f2a1..182052290 100644 --- a/lib/config-win32ce.h +++ b/lib/config-win32ce.h @@ -54,9 +54,6 @@ /* Define if you have the <io.h> header file. */ #define HAVE_IO_H 1 -/* Define if you have the <limits.h> header file. */ -#define HAVE_LIMITS_H 1 - /* Define if you need the malloc.h header header file even with stdlib.h */ #define NEED_MALLOC_H 1 diff --git a/lib/curl_config.h.cmake b/lib/curl_config.h.cmake index e4d14c784..e640cc656 100644 --- a/lib/curl_config.h.cmake +++ b/lib/curl_config.h.cmake @@ -398,9 +398,6 @@ /* if zlib is available */ #cmakedefine HAVE_LIBZ 1 -/* Define to 1 if you have the <limits.h> header file. */ -#cmakedefine HAVE_LIMITS_H 1 - /* if your compiler supports LL */ #cmakedefine HAVE_LL 1 diff --git a/lib/parsedate.c b/lib/parsedate.c index b82605bbe..0fabbd269 100644 --- a/lib/parsedate.c +++ b/lib/parsedate.c @@ -75,9 +75,7 @@ #include "curl_setup.h" -#ifdef HAVE_LIMITS_H #include <limits.h> -#endif #include <curl/curl.h> #include "strcase.h" diff --git a/lib/security.c b/lib/security.c index 9b989681f..ac39dae09 100644 --- a/lib/security.c +++ b/lib/security.c @@ -50,9 +50,7 @@ #include <netdb.h> #endif -#ifdef HAVE_LIMITS_H #include <limits.h> -#endif #include "urldata.h" #include "curl_base64.h" diff --git a/lib/setopt.c b/lib/setopt.c index f40b78e0b..49b7fac63 100644 --- a/lib/setopt.c +++ b/lib/setopt.c @@ -22,9 +22,7 @@ #include "curl_setup.h" -#ifdef HAVE_LIMITS_H #include <limits.h> -#endif #ifdef HAVE_NETINET_IN_H #include <netinet/in.h> diff --git a/lib/ssh-libssh.c b/lib/ssh-libssh.c index fb49a22d5..56775d70d 100644 --- a/lib/ssh-libssh.c +++ b/lib/ssh-libssh.c @@ -27,9 +27,7 @@ #ifdef USE_LIBSSH -#ifdef HAVE_LIMITS_H #include <limits.h> -#endif #include <libssh/libssh.h> #include <libssh/sftp.h> @@ -26,9 +26,7 @@ #ifdef USE_LIBSSH2 -#ifdef HAVE_LIMITS_H -# include <limits.h> -#endif +#include <limits.h> #include <libssh2.h> #include <libssh2_sftp.h> @@ -55,9 +55,7 @@ #error "We can't compile without socket() support!" #endif -#ifdef HAVE_LIMITS_H #include <limits.h> -#endif #ifdef USE_LIBIDN2 #include <idn2.h> diff --git a/lib/vtls/cyassl.c b/lib/vtls/cyassl.c index e06522304..46b71bfd3 100644 --- a/lib/vtls/cyassl.c +++ b/lib/vtls/cyassl.c @@ -76,9 +76,7 @@ and that's a problem since options.h hasn't been included yet. */ #endif #endif -#ifdef HAVE_LIMITS_H #include <limits.h> -#endif #include "urldata.h" #include "sendf.h" diff --git a/lib/vtls/darwinssl.c b/lib/vtls/darwinssl.c index 316904224..53a7ec37b 100644 --- a/lib/vtls/darwinssl.c +++ b/lib/vtls/darwinssl.c @@ -39,9 +39,7 @@ #pragma clang diagnostic ignored "-Wtautological-pointer-compare" #endif /* __clang__ */ -#ifdef HAVE_LIMITS_H #include <limits.h> -#endif #include <Security/Security.h> /* For some reason, when building for iOS, the omnibus header above does diff --git a/lib/vtls/gskit.c b/lib/vtls/gskit.c index de496dd12..8f0cc0bb8 100644 --- a/lib/vtls/gskit.c +++ b/lib/vtls/gskit.c @@ -61,9 +61,7 @@ #endif -#ifdef HAVE_LIMITS_H -# include <limits.h> -#endif +#include <limits.h> #include <curl/curl.h> #include "urldata.h" diff --git a/lib/vtls/openssl.c b/lib/vtls/openssl.c index 89f873342..8680af2f2 100644 --- a/lib/vtls/openssl.c +++ b/lib/vtls/openssl.c @@ -34,9 +34,7 @@ #ifdef USE_OPENSSL -#ifdef HAVE_LIMITS_H #include <limits.h> -#endif #include "urldata.h" #include "sendf.h" diff --git a/tests/libtest/lib1502.c b/tests/libtest/lib1502.c index 188c120f8..6f253c7ec 100644 --- a/tests/libtest/lib1502.c +++ b/tests/libtest/lib1502.c @@ -29,9 +29,7 @@ #include "test.h" -#ifdef HAVE_LIMITS_H #include <limits.h> -#endif #include "testutil.h" #include "warnless.h" diff --git a/tests/libtest/lib518.c b/tests/libtest/lib518.c index e2dcb440d..81c5a5fad 100644 --- a/tests/libtest/lib518.c +++ b/tests/libtest/lib518.c @@ -27,9 +27,7 @@ #ifdef HAVE_FCNTL_H #include <fcntl.h> #endif -#ifdef HAVE_LIMITS_H #include <limits.h> -#endif #include "warnless.h" #include "memdebug.h" diff --git a/tests/libtest/lib537.c b/tests/libtest/lib537.c index b5ee2ce5b..bdc2e62eb 100644 --- a/tests/libtest/lib537.c +++ b/tests/libtest/lib537.c @@ -27,9 +27,7 @@ #ifdef HAVE_FCNTL_H #include <fcntl.h> #endif -#ifdef HAVE_LIMITS_H #include <limits.h> -#endif #include "warnless.h" #include "memdebug.h" diff --git a/tests/libtest/lib540.c b/tests/libtest/lib540.c index a13653ce6..ff8a9b059 100644 --- a/tests/libtest/lib540.c +++ b/tests/libtest/lib540.c @@ -30,9 +30,7 @@ #include "test.h" -#ifdef HAVE_LIMITS_H #include <limits.h> -#endif #include "testutil.h" #include "warnless.h" diff --git a/tests/libtest/lib557.c b/tests/libtest/lib557.c index 9a87fbda9..22ab9ec2e 100644 --- a/tests/libtest/lib557.c +++ b/tests/libtest/lib557.c @@ -27,9 +27,7 @@ #include "test.h" -#ifdef HAVE_LIMITS_H #include <limits.h> -#endif #ifdef HAVE_LOCALE_H # include <locale.h> /* for setlocale() */ diff --git a/tests/libtest/lib591.c b/tests/libtest/lib591.c index f25cc4d73..0a406cee0 100644 --- a/tests/libtest/lib591.c +++ b/tests/libtest/lib591.c @@ -23,9 +23,7 @@ /* lib591 is used for test cases 591, 592, 593 and 594 */ -#ifdef HAVE_LIMITS_H #include <limits.h> -#endif #include <fcntl.h> diff --git a/tests/libtest/lib597.c b/tests/libtest/lib597.c index c8529743e..d7f38c4c8 100644 --- a/tests/libtest/lib597.c +++ b/tests/libtest/lib597.c @@ -21,9 +21,7 @@ ***************************************************************************/ #include "test.h" -#ifdef HAVE_LIMITS_H #include <limits.h> -#endif #include "testutil.h" #include "warnless.h" diff --git a/tests/libtest/libntlmconnect.c b/tests/libtest/libntlmconnect.c index 0d527a779..59f94b68a 100644 --- a/tests/libtest/libntlmconnect.c +++ b/tests/libtest/libntlmconnect.c @@ -21,9 +21,7 @@ ***************************************************************************/ #include "test.h" -#ifdef HAVE_LIMITS_H #include <limits.h> -#endif #include <assert.h> #include "testutil.h" |