aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorGisle Vanem <gvanem@broadpark.no>2006-08-30 16:17:06 +0000
committerGisle Vanem <gvanem@broadpark.no>2006-08-30 16:17:06 +0000
commitc7aae1030004da71c7c046fd6af259f91bbfa991 (patch)
tree168305d0b97e2d27c85ea465924563d1417919e0 /lib
parent909941405f2bb6c5209024ce0f41905d1fcdc4a7 (diff)
Removed "#ifndef__WATCOMC__". Use "#ifdef HAVE_SYS_TIME_H" instead.
Diffstat (limited to 'lib')
-rw-r--r--lib/connect.c2
-rw-r--r--lib/cookie.h4
-rw-r--r--lib/dict.c2
-rw-r--r--lib/easy.c2
-rw-r--r--lib/file.c2
-rw-r--r--lib/http.c2
-rw-r--r--lib/telnet.c2
-rw-r--r--lib/tftp.c2
-rw-r--r--lib/timeval.h2
-rw-r--r--lib/transfer.c2
-rw-r--r--lib/url.c2
11 files changed, 13 insertions, 11 deletions
diff --git a/lib/connect.c b/lib/connect.c
index d28f1f094..17dddaf87 100644
--- a/lib/connect.c
+++ b/lib/connect.c
@@ -25,7 +25,7 @@
#ifndef WIN32
/* headers for non-win32 */
-#ifndef __WATCOMC__
+#ifdef HAVE_SYS_TIME_H
#include <sys/time.h>
#endif
#ifdef HAVE_SYS_TYPES_H
diff --git a/lib/cookie.h b/lib/cookie.h
index 6d1b065b2..57c3acbdd 100644
--- a/lib/cookie.h
+++ b/lib/cookie.h
@@ -24,11 +24,13 @@
***************************************************************************/
#include <stdio.h>
-#if defined(WIN32) || defined(__WATCOMC__)
+#if defined(WIN32)
#include <time.h>
#else
+#ifdef HAVE_SYS_TIME_H
#include <sys/time.h>
#endif
+#endif
#include <curl/curl.h>
diff --git a/lib/dict.c b/lib/dict.c
index 6a5697952..1f130ad15 100644
--- a/lib/dict.c
+++ b/lib/dict.c
@@ -46,7 +46,7 @@
#include <sys/socket.h>
#endif
#include <netinet/in.h>
-#ifndef __WATCOMC__
+#ifdef HAVE_SYS_TIME_H
#include <sys/time.h>
#endif
#ifdef HAVE_UNISTD_H
diff --git a/lib/easy.c b/lib/easy.c
index 5a4138361..3356ca3cf 100644
--- a/lib/easy.c
+++ b/lib/easy.c
@@ -48,7 +48,7 @@
#include <sys/socket.h>
#endif
#include <netinet/in.h>
-#ifndef __WATCOMC__
+#ifdef HAVE_SYS_TIME_H
#include <sys/time.h>
#endif
#ifdef HAVE_UNISTD_H
diff --git a/lib/file.c b/lib/file.c
index 83cf8c679..4fb5b1f5f 100644
--- a/lib/file.c
+++ b/lib/file.c
@@ -48,7 +48,7 @@
#ifdef HAVE_NETINET_IN_H
#include <netinet/in.h>
#endif
-#ifndef __WATCOMC__
+#ifdef HAVE_SYS_TIME_H
#include <sys/time.h>
#endif
#ifdef HAVE_UNISTD_H
diff --git a/lib/http.c b/lib/http.c
index c148b4c79..1b638829b 100644
--- a/lib/http.c
+++ b/lib/http.c
@@ -47,7 +47,7 @@
#ifdef HAVE_NETINET_IN_H
#include <netinet/in.h>
#endif
-#ifndef __WATCOMC__
+#ifdef HAVE_SYS_TIME_H
#include <sys/time.h>
#endif
diff --git a/lib/telnet.c b/lib/telnet.c
index 9cbc666bc..596271981 100644
--- a/lib/telnet.c
+++ b/lib/telnet.c
@@ -45,7 +45,7 @@
#include <sys/socket.h>
#endif
#include <netinet/in.h>
-#ifndef __WATCOMC__
+#ifdef HAVE_SYS_TIME_H
#include <sys/time.h>
#endif
#ifdef HAVE_UNISTD_H
diff --git a/lib/tftp.c b/lib/tftp.c
index 9ae339734..8901e77ae 100644
--- a/lib/tftp.c
+++ b/lib/tftp.c
@@ -45,7 +45,7 @@
#include <sys/socket.h>
#endif
#include <netinet/in.h>
-#ifndef __WATCOMC__
+#ifdef HAVE_SYS_TIME_H
#include <sys/time.h>
#endif
#ifdef HAVE_UNISTD_H
diff --git a/lib/timeval.h b/lib/timeval.h
index a03ba2a6e..84ea27418 100644
--- a/lib/timeval.h
+++ b/lib/timeval.h
@@ -33,7 +33,7 @@
#if defined(WIN32) && !defined(__GNUC__) || defined(__MINGW32__)
#include <time.h>
#else
-#ifndef __WATCOMC__ /* todo: Add HAVE_SYS_TIME_H */
+#ifdef HAVE_SYS_TIME_H
#include <sys/time.h>
#endif
#endif
diff --git a/lib/transfer.c b/lib/transfer.c
index 79ce14df2..4fab23c73 100644
--- a/lib/transfer.c
+++ b/lib/transfer.c
@@ -51,7 +51,7 @@
#ifdef HAVE_NETINET_IN_H
#include <netinet/in.h>
#endif
-#ifndef __WATCOMC__
+#ifdef HAVE_SYS_TIME_H
#include <sys/time.h>
#endif
#ifdef HAVE_UNISTD_H
diff --git a/lib/url.c b/lib/url.c
index 8bb429ba4..bc6e3f2b8 100644
--- a/lib/url.c
+++ b/lib/url.c
@@ -46,7 +46,7 @@
#include <sys/socket.h>
#endif
#include <netinet/in.h>
-#ifndef __WATCOMC__
+#ifdef HAVE_SYS_TIME_H
#include <sys/time.h>
#endif
#ifdef HAVE_UNISTD_H