From: Dan Fandrich <dan@coneharvesters.com>
Date: Wed, 2 Jul 2008 18:34:00 +0000 (+0000)
Subject: Support Open Watcom C on Linux (as well as Windows).
X-Git-Tag: curl-7_19_0~410
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ee64d14733266ce533eeb3cbc86bd80212527b81;p=thirdparty%2Fcurl.git

Support Open Watcom C on Linux (as well as Windows).
---

diff --git a/CHANGES b/CHANGES
index aa43d9ebd2..ed1213cb55 100644
--- a/CHANGES
+++ b/CHANGES
@@ -6,6 +6,9 @@
 
                                   Changelog
 
+Daniel Fandrich (2 Jul 2008)
+- Support Open Watcom C on Linux (as well as Windows).
+
 Yang Tse (2 Jul 2008)
 - The previously committed fix for bug report #1999181 prevented using the
   monotonic clock on any system without an always supported POSIX compliant
diff --git a/include/curl/curl.h b/include/curl/curl.h
index 349a37714a..8182e9c289 100644
--- a/include/curl/curl.h
+++ b/include/curl/curl.h
@@ -71,7 +71,7 @@
 #ifndef _WIN32_WCE
 #include <sys/socket.h>
 #endif
-#ifndef __WATCOMC__
+#if !defined(WIN32) || !defined(__WATCOMC__)
 #include <sys/time.h>
 #endif
 #include <sys/types.h>
diff --git a/lib/if2ip.c b/lib/if2ip.c
index 18696e9e72..94a09c11e5 100644
--- a/lib/if2ip.c
+++ b/lib/if2ip.c
@@ -39,7 +39,8 @@
  */
 #if !defined(WIN32) && !defined(__BEOS__) && !defined(__CYGWIN__) && \
     !defined(__riscos__) && !defined(__INTERIX) && !defined(NETWARE) && \
-    !defined(__AMIGA__) && !defined(__minix) && !defined(__SYMBIAN32__)
+    !defined(__AMIGA__) && !defined(__minix) && !defined(__SYMBIAN32__) && \
+    !defined(__WATCOMC__)
 
 #ifdef HAVE_SYS_SOCKET_H
 #include <sys/socket.h>