diff options
| -rw-r--r-- | lib/dict.c | 10 | ||||
| -rw-r--r-- | lib/easy.c | 8 | ||||
| -rw-r--r-- | lib/file.c | 6 | ||||
| -rw-r--r-- | lib/gopher.c | 10 | ||||
| -rw-r--r-- | lib/http.c | 5 | ||||
| -rw-r--r-- | lib/ssh.c | 3 | ||||
| -rw-r--r-- | lib/telnet.c | 9 | ||||
| -rw-r--r-- | lib/tftp.c | 9 | ||||
| -rw-r--r-- | lib/transfer.c | 5 | ||||
| -rw-r--r-- | lib/url.c | 5 |
10 files changed, 18 insertions, 52 deletions
diff --git a/lib/dict.c b/lib/dict.c index 8c5540264..241781ab9 100644 --- a/lib/dict.c +++ b/lib/dict.c @@ -31,17 +31,18 @@ #include <stdlib.h> #include <ctype.h> -#ifdef WIN32 -#include <io.h> -#else #ifdef HAVE_SYS_SOCKET_H #include <sys/socket.h> #endif +#ifdef HAVE_NETINET_IN_H #include <netinet/in.h> +#endif #ifdef HAVE_UNISTD_H #include <unistd.h> #endif +#ifdef HAVE_NETDB_H #include <netdb.h> +#endif #ifdef HAVE_ARPA_INET_H #include <arpa/inet.h> #endif @@ -60,9 +61,6 @@ #include <sys/select.h> #endif - -#endif - #include "urldata.h" #include <curl/curl.h> #include "transfer.h" diff --git a/lib/easy.c b/lib/easy.c index 37b195543..30daf1585 100644 --- a/lib/easy.c +++ b/lib/easy.c @@ -29,11 +29,6 @@ #include <stdlib.h> #include <ctype.h> -#include "strequal.h" - -#ifdef WIN32 -#include <io.h> -#else #ifdef HAVE_SYS_SOCKET_H #include <sys/socket.h> #endif @@ -60,8 +55,7 @@ #include <sys/param.h> #endif -#endif /* WIN32 ... */ - +#include "strequal.h" #include "urldata.h" #include <curl/curl.h> #include "transfer.h" diff --git a/lib/file.c b/lib/file.c index 8df6f37fe..c29b0c9f8 100644 --- a/lib/file.c +++ b/lib/file.c @@ -30,10 +30,6 @@ #include <stdlib.h> #include <ctype.h> -#ifdef WIN32 -#include <io.h> -#include <fcntl.h> -#else #ifdef HAVE_SYS_SOCKET_H #include <sys/socket.h> #endif @@ -64,8 +60,6 @@ #include <fcntl.h> #endif -#endif /* WIN32 */ - #include "strtoofft.h" #include "urldata.h" #include <curl/curl.h> diff --git a/lib/gopher.c b/lib/gopher.c index 8447d3fa4..dc9c134b5 100644 --- a/lib/gopher.c +++ b/lib/gopher.c @@ -31,17 +31,18 @@ #include <stdlib.h> #include <ctype.h> -#ifdef WIN32 -#include <io.h> -#else #ifdef HAVE_SYS_SOCKET_H #include <sys/socket.h> #endif +#ifdef HAVE_NETINET_IN_H #include <netinet/in.h> +#endif #ifdef HAVE_UNISTD_H #include <unistd.h> #endif +#ifdef HAVE_NETDB_H #include <netdb.h> +#endif #ifdef HAVE_ARPA_INET_H #include <arpa/inet.h> #endif @@ -60,9 +61,6 @@ #include <sys/select.h> #endif - -#endif - #include "urldata.h" #include <curl/curl.h> #include "transfer.h" diff --git a/lib/http.c b/lib/http.c index cc01636c2..be0149cb9 100644 --- a/lib/http.c +++ b/lib/http.c @@ -30,9 +30,6 @@ #include <stdlib.h> #include <ctype.h> -#ifdef WIN32 -#include <io.h> -#else #ifdef HAVE_SYS_SOCKET_H #include <sys/socket.h> #endif @@ -60,8 +57,6 @@ #include <sys/param.h> #endif -#endif - #include "urldata.h" #include <curl/curl.h> #include "transfer.h" @@ -25,6 +25,7 @@ #include "setup.h" #ifdef USE_LIBSSH2 + #include <stdio.h> #include <string.h> #include <stdlib.h> @@ -45,7 +46,6 @@ #include <fcntl.h> #endif -#ifndef WIN32 #ifdef HAVE_SYS_SOCKET_H #include <sys/socket.h> #endif @@ -65,7 +65,6 @@ #include <in.h> #include <inet.h> #endif -#endif /* !WIN32 */ #if (defined(NETWARE) && defined(__NOVELL_LIBC__)) #undef in_addr_t diff --git a/lib/telnet.c b/lib/telnet.c index 2ae6e0ce2..5835e00cb 100644 --- a/lib/telnet.c +++ b/lib/telnet.c @@ -30,17 +30,18 @@ #include <stdlib.h> #include <ctype.h> -#if defined(WIN32) -#include <io.h> -#else #ifdef HAVE_SYS_SOCKET_H #include <sys/socket.h> #endif +#ifdef HAVE_NETINET_IN_H #include <netinet/in.h> +#endif #ifdef HAVE_UNISTD_H #include <unistd.h> #endif +#ifdef HAVE_NETDB_H #include <netdb.h> +#endif #ifdef HAVE_ARPA_INET_H #include <arpa/inet.h> #endif @@ -55,8 +56,6 @@ #include <sys/param.h> #endif -#endif /* WIN32 */ - #include "urldata.h" #include <curl/curl.h> #include "transfer.h" diff --git a/lib/tftp.c b/lib/tftp.c index 5bb0bd5b3..73ce7aa08 100644 --- a/lib/tftp.c +++ b/lib/tftp.c @@ -29,17 +29,18 @@ #include <stdlib.h> #include <ctype.h> -#if defined(WIN32) -#include <io.h> -#else #ifdef HAVE_SYS_SOCKET_H #include <sys/socket.h> #endif +#ifdef HAVE_NETINET_IN_H #include <netinet/in.h> +#endif #ifdef HAVE_UNISTD_H #include <unistd.h> #endif +#ifdef HAVE_NETDB_H #include <netdb.h> +#endif #ifdef HAVE_ARPA_INET_H #include <arpa/inet.h> #endif @@ -54,8 +55,6 @@ #include <sys/param.h> #endif -#endif /* WIN32 */ - #include "urldata.h" #include <curl/curl.h> #include "transfer.h" diff --git a/lib/transfer.c b/lib/transfer.c index 656e5ccb1..718507e1b 100644 --- a/lib/transfer.c +++ b/lib/transfer.c @@ -33,9 +33,6 @@ #include "strequal.h" #include "rawstr.h" -#ifdef WIN32 -#include <io.h> -#else #ifdef HAVE_SYS_SOCKET_H #include <sys/socket.h> #endif @@ -73,8 +70,6 @@ #error "We can't compile without socket() support!" #endif -#endif /* WIN32 */ - #include "urldata.h" #include <curl/curl.h> #include "netrc.h" @@ -30,9 +30,6 @@ #include <stdlib.h> #include <ctype.h> -#ifdef WIN32 -#include <io.h> -#else #ifdef HAVE_SYS_SOCKET_H #include <sys/socket.h> #endif @@ -68,8 +65,6 @@ #error "We can't compile without socket() support!" #endif -#endif /* WIN32 */ - #ifdef HAVE_LIMITS_H #include <limits.h> #endif |