From: Yang Tse <yangsita@gmail.com>
Date: Mon, 25 Jul 2011 02:08:08 +0000 (+0200)
Subject: time.h and sys/time.h inclusion conditionally done in setup_once.h
X-Git-Tag: curl-7_22_0~211
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0337b871975ab515c513d2c5d596feb9a489494d;p=thirdparty%2Fcurl.git

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

diff --git a/lib/connect.c b/lib/connect.c
index b9b6c75897..adfdd712dc 100644
--- 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 a950e359b0..c9d397934a 100644
--- 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 0baaeec3a2..8c5540264a 100644
--- 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 657b04201f..37b1955438 100644
--- 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 4f3ea1bb47..8df6f37feb 100644
--- 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 aa5a79ac1e..e6ab124aab 100644
--- 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 a3fef3971e..bbf6e9ef91 100644
--- 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 b2d2689d1c..8447d3fa4c 100644
--- 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 5c529231f8..cc01636c2a 100644
--- 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 8f6541dee6..c566c60708 100644
--- 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 89bed45275..841caa9688 100644
--- 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 80592d27e9..2ae6e0ce2a 100644
--- 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 24068fccb0..5bb0bd5b3f 100644
--- 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 6889fa7c76..656e5ccb1f 100644
--- 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 b28446c3be..f2bd6a0c74 100644
--- 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