From 0337b871975ab515c513d2c5d596feb9a489494d Mon Sep 17 00:00:00 2001 From: Yang Tse Date: Mon, 25 Jul 2011 04:08:08 +0200 Subject: time.h and sys/time.h inclusion conditionally done in setup_once.h --- lib/connect.c | 3 --- lib/cookie.h | 9 --------- lib/dict.c | 4 ---- lib/easy.c | 4 ---- lib/file.c | 4 ---- lib/formdata.c | 2 +- lib/ftplistparser.c | 2 -- lib/gopher.c | 4 ---- lib/http.c | 10 ---------- lib/select.c | 3 --- lib/ssh.c | 4 ---- lib/telnet.c | 4 ---- lib/tftp.c | 4 ---- lib/transfer.c | 4 ---- lib/url.c | 4 ---- 15 files changed, 1 insertion(+), 64 deletions(-) (limited to 'lib') diff --git a/lib/connect.c b/lib/connect.c index b9b6c7589..adfdd712d 100644 --- a/lib/connect.c +++ b/lib/connect.c @@ -22,9 +22,6 @@ #include "setup.h" -#ifdef HAVE_SYS_TIME_H -#include -#endif #ifdef HAVE_SYS_SOCKET_H #include #endif diff --git a/lib/cookie.h b/lib/cookie.h index a950e359b..c9d397934 100644 --- a/lib/cookie.h +++ b/lib/cookie.h @@ -22,15 +22,6 @@ * ***************************************************************************/ -#include -#if defined(WIN32) -#include -#else -#ifdef HAVE_SYS_TIME_H -#include -#endif -#endif - #include struct Cookie { diff --git a/lib/dict.c b/lib/dict.c index 0baaeec3a..8c5540264 100644 --- a/lib/dict.c +++ b/lib/dict.c @@ -32,16 +32,12 @@ #include #ifdef WIN32 -#include #include #else #ifdef HAVE_SYS_SOCKET_H #include #endif #include -#ifdef HAVE_SYS_TIME_H -#include -#endif #ifdef HAVE_UNISTD_H #include #endif diff --git a/lib/easy.c b/lib/easy.c index 657b04201..37b195543 100644 --- a/lib/easy.c +++ b/lib/easy.c @@ -32,7 +32,6 @@ #include "strequal.h" #ifdef WIN32 -#include #include #else #ifdef HAVE_SYS_SOCKET_H @@ -41,9 +40,6 @@ #ifdef HAVE_NETINET_IN_H #include #endif -#ifdef HAVE_SYS_TIME_H -#include -#endif #ifdef HAVE_UNISTD_H #include #endif diff --git a/lib/file.c b/lib/file.c index 4f3ea1bb4..8df6f37fe 100644 --- a/lib/file.c +++ b/lib/file.c @@ -31,7 +31,6 @@ #include #ifdef WIN32 -#include #include #include #else @@ -41,9 +40,6 @@ #ifdef HAVE_NETINET_IN_H #include #endif -#ifdef HAVE_SYS_TIME_H -#include -#endif #ifdef HAVE_UNISTD_H #include #endif diff --git a/lib/formdata.c b/lib/formdata.c index aa5a79ac1..e6ab124aa 100644 --- a/lib/formdata.c +++ b/lib/formdata.c @@ -32,10 +32,10 @@ #include #include #include -#include #if defined(HAVE_LIBGEN_H) && defined(HAVE_BASENAME) #include #endif + #include "urldata.h" /* for struct SessionHandle */ #include "formdata.h" #include "curl_rand.h" diff --git a/lib/ftplistparser.c b/lib/ftplistparser.c index a3fef3971..bbf6e9ef9 100644 --- a/lib/ftplistparser.c +++ b/lib/ftplistparser.c @@ -37,8 +37,6 @@ #include "setup.h" -#include - #include "ftplistparser.h" #include "curl_fnmatch.h" diff --git a/lib/gopher.c b/lib/gopher.c index b2d2689d1..8447d3fa4 100644 --- a/lib/gopher.c +++ b/lib/gopher.c @@ -32,16 +32,12 @@ #include #ifdef WIN32 -#include #include #else #ifdef HAVE_SYS_SOCKET_H #include #endif #include -#ifdef HAVE_SYS_TIME_H -#include -#endif #ifdef HAVE_UNISTD_H #include #endif diff --git a/lib/http.c b/lib/http.c index 5c529231f..cc01636c2 100644 --- a/lib/http.c +++ b/lib/http.c @@ -31,7 +31,6 @@ #include #ifdef WIN32 -#include #include #else #ifdef HAVE_SYS_SOCKET_H @@ -40,15 +39,6 @@ #ifdef HAVE_NETINET_IN_H #include #endif -#ifdef HAVE_SYS_TIME_H -#include -#endif - -#ifdef HAVE_TIME_H -#ifdef TIME_WITH_SYS_TIME -#include -#endif -#endif #ifdef HAVE_UNISTD_H #include diff --git a/lib/select.c b/lib/select.c index 8f6541dee..c566c6070 100644 --- a/lib/select.c +++ b/lib/select.c @@ -25,9 +25,6 @@ #ifdef HAVE_SYS_SELECT_H #include #endif -#ifdef HAVE_SYS_TIME_H -#include -#endif #if !defined(HAVE_SELECT) && !defined(HAVE_POLL_FINE) #error "We can't compile without select() or poll() support." diff --git a/lib/ssh.c b/lib/ssh.c index 89bed4527..841caa968 100644 --- a/lib/ssh.c +++ b/lib/ssh.c @@ -45,10 +45,6 @@ #include #endif -#ifdef HAVE_TIME_H -#include -#endif - #ifndef WIN32 #ifdef HAVE_SYS_SOCKET_H #include diff --git a/lib/telnet.c b/lib/telnet.c index 80592d27e..2ae6e0ce2 100644 --- a/lib/telnet.c +++ b/lib/telnet.c @@ -31,16 +31,12 @@ #include #if defined(WIN32) -#include #include #else #ifdef HAVE_SYS_SOCKET_H #include #endif #include -#ifdef HAVE_SYS_TIME_H -#include -#endif #ifdef HAVE_UNISTD_H #include #endif diff --git a/lib/tftp.c b/lib/tftp.c index 24068fccb..5bb0bd5b3 100644 --- a/lib/tftp.c +++ b/lib/tftp.c @@ -30,16 +30,12 @@ #include #if defined(WIN32) -#include #include #else #ifdef HAVE_SYS_SOCKET_H #include #endif #include -#ifdef HAVE_SYS_TIME_H -#include -#endif #ifdef HAVE_UNISTD_H #include #endif diff --git a/lib/transfer.c b/lib/transfer.c index 6889fa7c7..656e5ccb1 100644 --- a/lib/transfer.c +++ b/lib/transfer.c @@ -34,7 +34,6 @@ #include "rawstr.h" #ifdef WIN32 -#include #include #else #ifdef HAVE_SYS_SOCKET_H @@ -43,9 +42,6 @@ #ifdef HAVE_NETINET_IN_H #include #endif -#ifdef HAVE_SYS_TIME_H -#include -#endif #ifdef HAVE_UNISTD_H #include #endif diff --git a/lib/url.c b/lib/url.c index b28446c3b..f2bd6a0c7 100644 --- a/lib/url.c +++ b/lib/url.c @@ -31,7 +31,6 @@ #include #ifdef WIN32 -#include #include #else #ifdef HAVE_SYS_SOCKET_H @@ -40,9 +39,6 @@ #ifdef HAVE_NETINET_IN_H #include #endif -#ifdef HAVE_SYS_TIME_H -#include -#endif #ifdef HAVE_UNISTD_H #include #endif -- cgit v1.2.3