time.h and sys/time.h inclusion conditionally done in setup_once.h

diff --git a/lib/connect.c b/lib/connect.c
index b9b6c75897d0950b64d632c94b581669e83826d4..adfdd712dc3bc1ca0f67f73e078c1edc6e716811 100644 (file)
--- a/lib/connect.c
+++ b/lib/connect.c
@@ -22,9 +22,6 @@
 
 #include "setup.h"
 
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
 #ifdef HAVE_SYS_SOCKET_H
 #include <sys/socket.h>
 #endif

diff --git a/lib/cookie.h b/lib/cookie.h
index a950e359b0e22763a7a9c1ea7e7d6dd12ca6901f..c9d397934a0598a4b5b0a805e3c2dab88b5e265e 100644 (file)
--- a/lib/cookie.h
+++ b/lib/cookie.h
@@ -22,15 +22,6 @@
  *
  ***************************************************************************/
 
-#include <stdio.h>
-#if defined(WIN32)
-#include <time.h>
-#else
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
-#endif
-
 #include <curl/curl.h>
 
 struct Cookie {

diff --git a/lib/dict.c b/lib/dict.c
index 0baaeec3a25a74648d0750d63048934eb8963090..8c5540264a4d870e75e1c5a31d10f7b437a780b6 100644 (file)
--- a/lib/dict.c
+++ b/lib/dict.c
@@ -32,16 +32,12 @@
 #include <ctype.h>
 
 #ifdef WIN32
-#include <time.h>
 #include <io.h>
 #else
 #ifdef HAVE_SYS_SOCKET_H
 #include <sys/socket.h>
 #endif
 #include <netinet/in.h>
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif

diff --git a/lib/easy.c b/lib/easy.c
index 657b04201f353fda0185f446129332b54d9cdd00..37b19554386ec7263bedf1c595db734e4c3b829d 100644 (file)
--- a/lib/easy.c
+++ b/lib/easy.c
@@ -32,7 +32,6 @@
 #include "strequal.h"
 
 #ifdef WIN32
-#include <time.h>
 #include <io.h>
 #else
 #ifdef HAVE_SYS_SOCKET_H
@@ -41,9 +40,6 @@
 #ifdef HAVE_NETINET_IN_H
 #include <netinet/in.h>
 #endif
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif

diff --git a/lib/file.c b/lib/file.c
index 4f3ea1bb4716663baf10ac96fe36f08a66e70413..8df6f37feb1909481f22c51d98adb0152be1ccc9 100644 (file)
--- a/lib/file.c
+++ b/lib/file.c
@@ -31,7 +31,6 @@
 #include <ctype.h>
 
 #ifdef WIN32
-#include <time.h>
 #include <io.h>
 #include <fcntl.h>
 #else
@@ -41,9 +40,6 @@
 #ifdef HAVE_NETINET_IN_H
 #include <netinet/in.h>
 #endif
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif

diff --git a/lib/formdata.c b/lib/formdata.c
index aa5a79ac1ece9a40637799e3e8f8d4299cadc82a..e6ab124aab88853cb4fecd5707211670e2668026 100644 (file)
--- a/lib/formdata.c
+++ b/lib/formdata.c
@@ -32,10 +32,10 @@
 #include <stdlib.h>
 #include <string.h>
 #include <stdarg.h>
-#include <time.h>
 #if defined(HAVE_LIBGEN_H) && defined(HAVE_BASENAME)
 #include <libgen.h>
 #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 a3fef3971e0a33a27d8428b57f4fe196f60292eb..bbf6e9ef915dd73e578a3547a9b9b4372aee1c2a 100644 (file)
--- a/lib/ftplistparser.c
+++ b/lib/ftplistparser.c
@@ -37,8 +37,6 @@
 
 #include "setup.h"
 
-#include <time.h>
-
 #include "ftplistparser.h"
 #include "curl_fnmatch.h"
 

diff --git a/lib/gopher.c b/lib/gopher.c
index b2d2689d1c2adbf5db7d69b92c427249263fa249..8447d3fa4cf8073590240782e406c28d5bd0300c 100644 (file)
--- a/lib/gopher.c
+++ b/lib/gopher.c
@@ -32,16 +32,12 @@
 #include <ctype.h>
 
 #ifdef WIN32
-#include <time.h>
 #include <io.h>
 #else
 #ifdef HAVE_SYS_SOCKET_H
 #include <sys/socket.h>
 #endif
 #include <netinet/in.h>
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif

diff --git a/lib/http.c b/lib/http.c
index 5c529231f82db8727bbe5eba754740b0aa50a159..cc01636c2afec5595ee63ebc7d2a229083fbc3ee 100644 (file)
--- a/lib/http.c
+++ b/lib/http.c
@@ -31,7 +31,6 @@
 #include <ctype.h>
 
 #ifdef WIN32
-#include <time.h>
 #include <io.h>
 #else
 #ifdef HAVE_SYS_SOCKET_H
@@ -40,15 +39,6 @@
 #ifdef HAVE_NETINET_IN_H
 #include <netinet/in.h>
 #endif
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
-
-#ifdef HAVE_TIME_H
-#ifdef TIME_WITH_SYS_TIME
-#include <time.h>
-#endif
-#endif
 
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>

diff --git a/lib/select.c b/lib/select.c
index 8f6541dee654df6748e38c3be8b7e24fb323e2f3..c566c607087319a39be618cc5a279e3f899d0a67 100644 (file)
--- a/lib/select.c
+++ b/lib/select.c
@@ -25,9 +25,6 @@
 #ifdef HAVE_SYS_SELECT_H
 #include <sys/select.h>
 #endif
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#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 89bed45275e294bbe9b0988d1532dff44116639d..841caa9688d8438e9f20ab9972c719a11c5b0ee8 100644 (file)
--- a/lib/ssh.c
+++ b/lib/ssh.c
@@ -45,10 +45,6 @@
 #include <fcntl.h>
 #endif
 
-#ifdef HAVE_TIME_H
-#include <time.h>
-#endif
-
 #ifndef WIN32
 #ifdef HAVE_SYS_SOCKET_H
 #include <sys/socket.h>

diff --git a/lib/telnet.c b/lib/telnet.c
index 80592d27e9f60b00778936d355536f6f2dc9b801..2ae6e0ce2aa7d457d8f477adcaa1fb38da82a0c8 100644 (file)
--- a/lib/telnet.c
+++ b/lib/telnet.c
@@ -31,16 +31,12 @@
 #include <ctype.h>
 
 #if defined(WIN32)
-#include <time.h>
 #include <io.h>
 #else
 #ifdef HAVE_SYS_SOCKET_H
 #include <sys/socket.h>
 #endif
 #include <netinet/in.h>
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif

diff --git a/lib/tftp.c b/lib/tftp.c
index 24068fccb031dd7d25003dd3b6f0bac8fd18fcb9..5bb0bd5b3f27c6e6096b957a57024e8d33cef34a 100644 (file)
--- a/lib/tftp.c
+++ b/lib/tftp.c
@@ -30,16 +30,12 @@
 #include <ctype.h>
 
 #if defined(WIN32)
-#include <time.h>
 #include <io.h>
 #else
 #ifdef HAVE_SYS_SOCKET_H
 #include <sys/socket.h>
 #endif
 #include <netinet/in.h>
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif

diff --git a/lib/transfer.c b/lib/transfer.c
index 6889fa7c76b1fed76382172004f9a4d65020a19b..656e5ccb1f688fc2f99e952d1684d9ce6880effe 100644 (file)
--- a/lib/transfer.c
+++ b/lib/transfer.c
@@ -34,7 +34,6 @@
 #include "rawstr.h"
 
 #ifdef WIN32
-#include <time.h>
 #include <io.h>
 #else
 #ifdef HAVE_SYS_SOCKET_H
@@ -43,9 +42,6 @@
 #ifdef HAVE_NETINET_IN_H
 #include <netinet/in.h>
 #endif
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif

diff --git a/lib/url.c b/lib/url.c
index b28446c3be14f003b02181e576c848595c277335..f2bd6a0c7401500212771da42d6c186ed6c63dce 100644 (file)
--- a/lib/url.c
+++ b/lib/url.c
@@ -31,7 +31,6 @@
 #include <ctype.h>
 
 #ifdef WIN32
-#include <time.h>
 #include <io.h>
 #else
 #ifdef HAVE_SYS_SOCKET_H
@@ -40,9 +39,6 @@
 #ifdef HAVE_NETINET_IN_H
 #include <netinet/in.h>
 #endif
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif