Removed inclusion of <sys/types.h> and <sys/stat.h> in .c-files

since they're already included through "setup.h".

diff --git a/lib/connect.c b/lib/connect.c
index 14e2ff038be371189559455fa14f69511f27a3ce..a18a335af837469a67a4e607fdd6ccad7616ec49 100644 (file)
--- a/lib/connect.c
+++ b/lib/connect.c
@@ -28,9 +28,6 @@
 #ifdef HAVE_SYS_TIME_H
 #include <sys/time.h>
 #endif
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
 #ifdef HAVE_SYS_SOCKET_H
 #include <sys/socket.h>
 #endif
@@ -59,9 +56,9 @@
 #include <arpa/inet.h>
 #endif
 #ifdef HAVE_STDLIB_H
-#include <stdlib.h> /* required for free() prototype, without it, this crashes
-                       on macos 68K */
-#endif
+#include <stdlib.h> /* required for free() prototype, without it, this crashes */
+#endif              /* on macos 68K */
+
 #if (defined(HAVE_FIONBIO) && defined(__NOVELL_LIBC__))
 #include <sys/filio.h>
 #endif
@@ -74,7 +71,8 @@
 #include <inet.h>
 #endif
 
-#endif
+#endif  /* !WIN32 */
+
 #include <stdio.h>
 #include <errno.h>
 #include <string.h>

diff --git a/lib/dict.c b/lib/dict.c
index d6443f4b95ff0bc99d3284e0ea7f39640bb193eb..c302cd03442742c6f5a7a3ad282b59b5899384c2 100644 (file)
--- a/lib/dict.c
+++ b/lib/dict.c
@@ -31,12 +31,6 @@
 #include <stdarg.h>
 #include <stdlib.h>
 #include <ctype.h>
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_STAT_H
-#include <sys/stat.h>
-#endif
 
 #ifdef WIN32
 #include <time.h>

diff --git a/lib/easy.c b/lib/easy.c
index 1ada99c3d7db828a2d19d11c33f58ae62cdf9bda..d86f7cde563082be9ed048795892af8416b112e7 100644 (file)
--- a/lib/easy.c
+++ b/lib/easy.c
@@ -29,13 +29,6 @@
 #include <stdarg.h>
 #include <stdlib.h>
 #include <ctype.h>
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_STAT_H
-#include <sys/stat.h>
-#endif
-
 #include <errno.h>
 
 #include "strequal.h"

diff --git a/lib/file.c b/lib/file.c
index b247a7736e60cc8fa51f0f2b5361c9eae58d1dbb..3fc1663d138528c309de0541dadd5cfc2e7affbd 100644 (file)
--- a/lib/file.c
+++ b/lib/file.c
@@ -30,12 +30,6 @@
 #include <stdarg.h>
 #include <stdlib.h>
 #include <ctype.h>
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_STAT_H
-#include <sys/stat.h>
-#endif
 
 #ifdef WIN32
 #include <time.h>

diff --git a/lib/formdata.c b/lib/formdata.c
index f10c6c70e1afa0242b9c6363cd538615cf652a8e..a5118b3893aa764f569a4bc3bd76ec14aff0308e 100644 (file)
--- a/lib/formdata.c
+++ b/lib/formdata.c
@@ -112,9 +112,6 @@ Content-Disposition: form-data; name="FILECONTENT"
 #include <string.h>
 #include <stdarg.h>
 #include <time.h>
-#ifdef HAVE_SYS_STAT_H
-#include <sys/stat.h>
-#endif
 #if defined(HAVE_LIBGEN_H) && defined(HAVE_BASENAME)
 #include <libgen.h>
 #endif

diff --git a/lib/ftp.c b/lib/ftp.c
index 8328315dc435caec31da03594b89526583b4d47b..8c54f727414e97393a6caaf30e776ec96aa708c8 100644 (file)
--- a/lib/ftp.c
+++ b/lib/ftp.c
@@ -34,13 +34,10 @@
 #include <unistd.h>
 #endif
 
-#ifdef WIN32
-
-#else /* probably some kind of unix */
+#ifndef WIN32
 #ifdef HAVE_SYS_SOCKET_H
 #include <sys/socket.h>
 #endif
-#include <sys/types.h>
 #ifdef HAVE_NETINET_IN_H
 #include <netinet/in.h>
 #endif
@@ -57,7 +54,7 @@
 #include <in.h>
 #include <inet.h>
 #endif
-#endif
+#endif  /* !WIN32 */
 
 #if (defined(NETWARE) && defined(__NOVELL_LIBC__))
 #undef in_addr_t
@@ -3024,7 +3021,7 @@ CURLcode Curl_ftp_done(struct connectdata *conn, CURLcode status, bool premature
       ftpc->ctl_valid = was_ctl_valid;
       break;
     }
-    /* until we cope better with prematurely ended requests, let them 
+    /* until we cope better with prematurely ended requests, let them
      * fallback as if in complete failure */
   default:       /* by default, an error means the control connection is
                     wedged and should not be used anymore */

diff --git a/lib/gtls.c b/lib/gtls.c
index f8c103450cf9d2c48ee631867df6762324eddacc..3413a0709c47c57dbe5f7b46c17c9a5344c2f999 100644 (file)
--- a/lib/gtls.c
+++ b/lib/gtls.c
@@ -37,9 +37,6 @@
 #include <string.h>
 #include <stdlib.h>
 #include <ctype.h>
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
 #ifdef HAVE_SYS_SOCKET_H
 #include <sys/socket.h>
 #endif

diff --git a/lib/hostares.c b/lib/hostares.c
index 1eb2aea2bde99ddf7e170cf0a4f80353bda3dc2d..c9fbcc6de2abdaca8867b092dcdae5a881eeca21 100644 (file)
--- a/lib/hostares.c
+++ b/lib/hostares.c
@@ -28,9 +28,6 @@
 #ifdef NEED_MALLOC_H
 #include <malloc.h>
 #endif
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
 #ifdef HAVE_SYS_SOCKET_H
 #include <sys/socket.h>
 #endif

diff --git a/lib/hostasyn.c b/lib/hostasyn.c
index 3df147910adbff3bed29263f96b0fab5f7446d86..35563860424c877b20800c3dbcaf6a2ae4918aef 100644 (file)
--- a/lib/hostasyn.c
+++ b/lib/hostasyn.c
@@ -28,9 +28,6 @@
 #ifdef NEED_MALLOC_H
 #include <malloc.h>
 #endif
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
 #ifdef HAVE_SYS_SOCKET_H
 #include <sys/socket.h>
 #endif

diff --git a/lib/hostip.c b/lib/hostip.c
index b27475188990a98137821eb5da174257671f4026..399ac53e59329e20dc2cf8125ff467d0b9ba9e8c 100644 (file)
--- a/lib/hostip.c
+++ b/lib/hostip.c
@@ -28,9 +28,6 @@
 #ifdef NEED_MALLOC_H
 #include <malloc.h>
 #endif
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
 #ifdef HAVE_SYS_SOCKET_H
 #include <sys/socket.h>
 #endif

diff --git a/lib/hostip4.c b/lib/hostip4.c
index 5c0c8841dbc5879ff89a09ecc63600f741a27a53..3b040a48f371b0c32960e3e41d5502587f1ad7c1 100644 (file)
--- a/lib/hostip4.c
+++ b/lib/hostip4.c
@@ -29,9 +29,6 @@
 #ifdef NEED_MALLOC_H
 #include <malloc.h>
 #endif
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
 #ifdef HAVE_SYS_SOCKET_H
 #include <sys/socket.h>
 #endif

diff --git a/lib/hostip6.c b/lib/hostip6.c
index d69a4c6589d83857cb9129d98c1d0c8867c558f0..777b1e3197ced394fc845af464d777843129be92 100644 (file)
--- a/lib/hostip6.c
+++ b/lib/hostip6.c
@@ -28,9 +28,6 @@
 #ifdef NEED_MALLOC_H
 #include <malloc.h>
 #endif
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
 #ifdef HAVE_SYS_SOCKET_H
 #include <sys/socket.h>
 #endif

diff --git a/lib/hostsyn.c b/lib/hostsyn.c
index 2f816b858328e43cfef01914bdf3f88cdcc28425..dcca62e4ec24d0b197838a88dd74ed5727ca3063 100644 (file)
--- a/lib/hostsyn.c
+++ b/lib/hostsyn.c
@@ -28,9 +28,6 @@
 #ifdef NEED_MALLOC_H
 #include <malloc.h>
 #endif
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
 #ifdef HAVE_SYS_SOCKET_H
 #include <sys/socket.h>
 #endif

diff --git a/lib/hostthre.c b/lib/hostthre.c
index 9c8942a289c68b45307c0cfaec8f9b64fefc0250..bd7a483c2c9a6ea61d027c4dca3d1ea7c91e0e5f 100644 (file)
--- a/lib/hostthre.c
+++ b/lib/hostthre.c
@@ -29,9 +29,6 @@
 #ifdef NEED_MALLOC_H
 #include <malloc.h>
 #endif
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
 #ifdef HAVE_SYS_SOCKET_H
 #include <sys/socket.h>
 #endif

diff --git a/lib/http.c b/lib/http.c
index 16c59fb87cc19aac83ba5f36a35a39db6f11b95a..b4a62f4968c74d9c82eb9a62091358b512e7f893 100644 (file)
--- a/lib/http.c
+++ b/lib/http.c
@@ -30,12 +30,6 @@
 #include <stdarg.h>
 #include <stdlib.h>
 #include <ctype.h>
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_STAT_H
-#include <sys/stat.h>
-#endif
 
 #ifdef WIN32
 #include <time.h>

diff --git a/lib/inet_ntop.c b/lib/inet_ntop.c
index 8ff428192398e8b74a53e7f9ace6cdb846d4d890..a05689adbf996de8d31e53fc2fd59897f2ed4c19 100644 (file)
--- a/lib/inet_ntop.c
+++ b/lib/inet_ntop.c
@@ -25,9 +25,6 @@
 #ifdef HAVE_SYS_PARAM_H
 #include <sys/param.h>
 #endif
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
 #ifdef HAVE_SYS_SOCKET_H
 #include <sys/socket.h>
 #endif

diff --git a/lib/inet_pton.c b/lib/inet_pton.c
index edffeabca2cc5b4a9e8cdba847ea93710da9abf6..192d0624acb0594216b6aa4dc25ead2e36275d3e 100644 (file)
--- a/lib/inet_pton.c
+++ b/lib/inet_pton.c
@@ -23,9 +23,6 @@
 #ifdef HAVE_SYS_PARAM_H
 #include <sys/param.h>
 #endif
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
 #ifdef HAVE_SYS_SOCKET_H
 #include <sys/socket.h>
 #endif

diff --git a/lib/ldap.c b/lib/ldap.c
index 3e1144d4fe7bec7ecf29bf03d337253cc6df97ea..991204fd0719989ee64aee06e32dcb31e6e43163 100644 (file)
--- a/lib/ldap.c
+++ b/lib/ldap.c
@@ -30,12 +30,6 @@
 #include <stdarg.h>
 #include <stdlib.h>
 #include <ctype.h>
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_STAT_H
-#include <sys/stat.h>
-#endif
 #ifdef NEED_MALLOC_H
 #include <malloc.h>
 #endif
@@ -115,7 +109,7 @@
 #undef HAVE_LIBDL
 #endif
 
-/* 
+/*
  * We use this ZERO_NULL to avoid picky compiler warnings,
  * when assigning a NULL pointer to a function pointer var.
  */

diff --git a/lib/mprintf.c b/lib/mprintf.c
index 3224521b0fcc3ee867751334fe981a0b4644e6c8..55a6f62959ed8eb292aefdbff71ecc9f21e2e248 100644 (file)
--- a/lib/mprintf.c
+++ b/lib/mprintf.c
@@ -31,7 +31,6 @@
 
 
 #include "setup.h"
-#include <sys/types.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdarg.h>

diff --git a/lib/multi.c b/lib/multi.c
index e55cb69941be8a04f693812645db894e99ff1802..c04cad14297762673176e1fd580e9b89d9dc1907 100644 (file)
--- a/lib/multi.c
+++ b/lib/multi.c
@@ -22,12 +22,10 @@
  ***************************************************************************/
 
 #include "setup.h"
+
 #include <stdlib.h>
 #include <string.h>
 
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
 #ifdef HAVE_SYS_SOCKET_H
 #include <sys/socket.h>
 #endif

diff --git a/lib/netrc.c b/lib/netrc.c
index 54d175989d965f3e3b53f864728a1651a3c3cb39..da366fb6bd765e106dd8b627c0eac8aa91321f90 100644 (file)
--- a/lib/netrc.c
+++ b/lib/netrc.c
@@ -27,9 +27,6 @@
 #include <stdlib.h>
 #include <string.h>
 
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif

diff --git a/lib/nss.c b/lib/nss.c
index afeb2ffb96caf0b274006987bce1ec11fe5c38e5..652d9f1f72611a1fad55c7c67b45f660d7f7860c 100644 (file)
--- a/lib/nss.c
+++ b/lib/nss.c
@@ -31,9 +31,6 @@
 #include <string.h>
 #include <stdlib.h>
 #include <ctype.h>
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
 #ifdef HAVE_SYS_SOCKET_H
 #include <sys/socket.h>
 #endif

diff --git a/lib/select.c b/lib/select.c
index 12f34bcc807cf4022cb22938593beb48208806fc..4f8878401a1b2ea2d2631d95d5ea56ad3a21b329 100644 (file)
--- a/lib/select.c
+++ b/lib/select.c
@@ -25,9 +25,6 @@
 
 #include <errno.h>
 
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
 #ifdef HAVE_SYS_SELECT_H
 #include <sys/select.h>
 #endif

diff --git a/lib/sendf.c b/lib/sendf.c
index 5d8c191d60a3ac17c67e3ce0e8dbfba78514ee0e..bf9ee490a77cef0eed1228a47f3bc5e6c6f3fd34 100644 (file)
--- a/lib/sendf.c
+++ b/lib/sendf.c
@@ -28,10 +28,6 @@
 #include <stdlib.h>
 #include <errno.h>
 
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-
 #ifdef HAVE_SYS_SOCKET_H
 #include <sys/socket.h> /* required for send() & recv() prototypes */
 #endif

diff --git a/lib/ssh.c b/lib/ssh.c
index d002173abaf4338ebd51df492c34ac42bcb3bf05..1846945a7b5264c318b8e1042dfc0b1f65a0f589 100644 (file)
--- a/lib/ssh.c
+++ b/lib/ssh.c
@@ -44,24 +44,14 @@
 #include <fcntl.h>
 #endif
 
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_STAT_H
-#include <sys/stat.h>
-#endif
-
 #ifdef HAVE_TIME_H
 #include <time.h>
 #endif
 
-#ifdef WIN32
-
-#else /* probably some kind of unix */
+#ifndef WIN32
 #ifdef HAVE_SYS_SOCKET_H
 #include <sys/socket.h>
 #endif
-#include <sys/types.h>
 #ifdef HAVE_NETINET_IN_H
 #include <netinet/in.h>
 #endif
@@ -78,7 +68,7 @@
 #include <in.h>
 #include <inet.h>
 #endif
-#endif
+#endif /* !WIN32 */
 
 #if (defined(NETWARE) && defined(__NOVELL_LIBC__))
 #undef in_addr_t

diff --git a/lib/sslgen.c b/lib/sslgen.c
index 6b1de1e3c15d3b6a099646a3d2bf1bd8e713038a..6bf2403958b3b32ed1d71976b849ecde74fc32e4 100644 (file)
--- a/lib/sslgen.c
+++ b/lib/sslgen.c
@@ -38,12 +38,10 @@
 */
 
 #include "setup.h"
+
 #include <string.h>
 #include <stdlib.h>
 #include <ctype.h>
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
 #ifdef HAVE_SYS_SOCKET_H
 #include <sys/socket.h>
 #endif

diff --git a/lib/ssluse.c b/lib/ssluse.c
index 6ef57853a02129e2fce8e1b95b8fce82c763014d..5bcc3a1e3603b7ae73f4e6cc90fa5ceff4eb20b2 100644 (file)
--- a/lib/ssluse.c
+++ b/lib/ssluse.c
@@ -36,9 +36,6 @@
 #include <string.h>
 #include <stdlib.h>
 #include <ctype.h>
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
 #ifdef HAVE_SYS_SOCKET_H
 #include <sys/socket.h>
 #endif

diff --git a/lib/telnet.c b/lib/telnet.c
index 74467ec868fa5bc8fda7b4886d8402c0080315e7..756f358f4fc9cfb9b047e18777101f51b0c3e5a5 100644 (file)
--- a/lib/telnet.c
+++ b/lib/telnet.c
@@ -30,12 +30,6 @@
 #include <stdarg.h>
 #include <stdlib.h>
 #include <ctype.h>
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_STAT_H
-#include <sys/stat.h>
-#endif
 
 #if defined(WIN32)
 #include <time.h>
@@ -65,8 +59,7 @@
 #include <sys/param.h>
 #endif
 
-
-#endif
+#endif  /* WIN32 */
 
 #include "urldata.h"
 #include <curl/curl.h>

diff --git a/lib/tftp.c b/lib/tftp.c
index 493725a23c8e632d52105e447bc6ee2b32f2bb25..bc17974adb46138caa2700d1a354c45734301b5f 100644 (file)
--- a/lib/tftp.c
+++ b/lib/tftp.c
@@ -30,12 +30,6 @@
 #include <stdarg.h>
 #include <stdlib.h>
 #include <ctype.h>
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_STAT_H
-#include <sys/stat.h>
-#endif
 
 #if defined(WIN32)
 #include <time.h>
@@ -65,8 +59,7 @@
 #include <sys/param.h>
 #endif
 
-
-#endif
+#endif /* WIN32 */
 
 #include "urldata.h"
 #include <curl/curl.h>

diff --git a/lib/transfer.c b/lib/transfer.c
index 324aba2607d45838e1484ca0765c3551803fb3c0..8e6f5e19f833e8e8d7fd124a075cb9cd20ab7d01 100644 (file)
--- a/lib/transfer.c
+++ b/lib/transfer.c
@@ -29,13 +29,6 @@
 #include <stdarg.h>
 #include <stdlib.h>
 #include <ctype.h>
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_STAT_H
-#include <sys/stat.h>
-#endif
-
 #include <errno.h>
 
 #include "strtoofft.h"
@@ -81,7 +74,7 @@
 #error "We can't compile without socket() support!"
 #endif
 
-#endif
+#endif  /* WIN32 */
 
 #include "urldata.h"
 #include <curl/curl.h>

diff --git a/lib/url.c b/lib/url.c
index e777d2a1faa14d94563feaf7414c8bcbe2260ffc..64a145cdbf446f2c371d685ba5a8c55d9f48c0c9 100644 (file)
--- a/lib/url.c
+++ b/lib/url.c
@@ -30,12 +30,6 @@
 #include <stdarg.h>
 #include <stdlib.h>
 #include <ctype.h>
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_STAT_H
-#include <sys/stat.h>
-#endif
 #include <errno.h>
 
 #ifdef WIN32
@@ -78,7 +72,8 @@
 #ifndef HAVE_SOCKET
 #error "We can't compile without socket() support!"
 #endif
-#endif
+
+#endif  /* WIN32 */
 
 #ifdef USE_LIBIDN
 #include <idna.h>