From: Gisle Vanem <gvanem@broadpark.no>
Date: Tue, 29 Aug 2006 18:45:55 +0000 (+0000)
Subject: Watcom lacks <sys/time.h>.
X-Git-Tag: curl-7_15_6-prepipeline~18
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=59cf6fd4f058917839a407f5a206f5f1c1a004a6;p=thirdparty%2Fcurl.git

Watcom lacks <sys/time.h>.
---

diff --git a/lib/connect.c b/lib/connect.c
index 4e7f4f8ea1..d28f1f094b 100644
--- a/lib/connect.c
+++ b/lib/connect.c
@@ -25,7 +25,9 @@
 
 #ifndef WIN32
 /* headers for non-win32 */
+#ifndef __WATCOMC__
 #include <sys/time.h>
+#endif
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
 #endif
diff --git a/lib/cookie.h b/lib/cookie.h
index 22dc755c42..6d1b065b2e 100644
--- a/lib/cookie.h
+++ b/lib/cookie.h
@@ -24,7 +24,7 @@
  ***************************************************************************/
 
 #include <stdio.h>
-#ifdef WIN32
+#if defined(WIN32) || defined(__WATCOMC__)
 #include <time.h>
 #else
 #include <sys/time.h>
diff --git a/lib/dict.c b/lib/dict.c
index d5a2400ca9..86d00c961e 100644
--- a/lib/dict.c
+++ b/lib/dict.c
@@ -46,7 +46,9 @@
 #include <sys/socket.h>
 #endif
 #include <netinet/in.h>
+#ifndef __WATCOMC__
 #include <sys/time.h>
+#endif
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
diff --git a/lib/easy.c b/lib/easy.c
index 827463ad87..5a41383619 100644
--- a/lib/easy.c
+++ b/lib/easy.c
@@ -48,7 +48,9 @@
 #include <sys/socket.h>
 #endif
 #include <netinet/in.h>
+#ifndef __WATCOMC__
 #include <sys/time.h>
+#endif
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
diff --git a/lib/file.c b/lib/file.c
index 7ac53f19b4..83cf8c679c 100644
--- a/lib/file.c
+++ b/lib/file.c
@@ -48,7 +48,9 @@
 #ifdef HAVE_NETINET_IN_H
 #include <netinet/in.h>
 #endif
+#ifndef __WATCOMC__
 #include <sys/time.h>
+#endif
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
diff --git a/lib/http.c b/lib/http.c
index aab0b85a2a..c148b4c79e 100644
--- a/lib/http.c
+++ b/lib/http.c
@@ -47,7 +47,9 @@
 #ifdef HAVE_NETINET_IN_H
 #include <netinet/in.h>
 #endif
+#ifndef __WATCOMC__
 #include <sys/time.h>
+#endif
 
 #ifdef HAVE_TIME_H
 #ifdef TIME_WITH_SYS_TIME
diff --git a/lib/telnet.c b/lib/telnet.c
index 8939dd1a69..9cbc666bc4 100644
--- a/lib/telnet.c
+++ b/lib/telnet.c
@@ -45,7 +45,9 @@
 #include <sys/socket.h>
 #endif
 #include <netinet/in.h>
+#ifndef __WATCOMC__
 #include <sys/time.h>
+#endif
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
diff --git a/lib/tftp.c b/lib/tftp.c
index 61800cc3df..9ae3397340 100644
--- a/lib/tftp.c
+++ b/lib/tftp.c
@@ -45,7 +45,9 @@
 #include <sys/socket.h>
 #endif
 #include <netinet/in.h>
+#ifndef __WATCOMC__
 #include <sys/time.h>
+#endif
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
diff --git a/lib/timeval.h b/lib/timeval.h
index 6be5e4276a..a03ba2a6e3 100644
--- a/lib/timeval.h
+++ b/lib/timeval.h
@@ -33,8 +33,10 @@
 #if defined(WIN32) && !defined(__GNUC__) || defined(__MINGW32__)
 #include <time.h>
 #else
+#ifndef __WATCOMC__     /* todo: Add HAVE_SYS_TIME_H */
 #include <sys/time.h>
 #endif
+#endif
 
 #ifndef HAVE_GETTIMEOFDAY
 #if !defined(_WINSOCKAPI_) && !defined(__MINGW32__) && !defined(_AMIGASF) && \
diff --git a/lib/transfer.c b/lib/transfer.c
index fb1bcb2860..79ce14df2a 100644
--- a/lib/transfer.c
+++ b/lib/transfer.c
@@ -51,7 +51,9 @@
 #ifdef HAVE_NETINET_IN_H
 #include <netinet/in.h>
 #endif
+#ifndef __WATCOMC__
 #include <sys/time.h>
+#endif
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
diff --git a/lib/url.c b/lib/url.c
index 17f5436153..8bb429ba43 100644
--- a/lib/url.c
+++ b/lib/url.c
@@ -46,7 +46,9 @@
 #include <sys/socket.h>
 #endif
 #include <netinet/in.h>
+#ifndef __WATCOMC__
 #include <sys/time.h>
+#endif
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif