aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Fandrich <dan@coneharvesters.com>2008-07-02 18:34:00 +0000
committerDan Fandrich <dan@coneharvesters.com>2008-07-02 18:34:00 +0000
commitee64d14733266ce533eeb3cbc86bd80212527b81 (patch)
tree1d9261aa07888f7a67b5daee45428fe01caf4c3d
parentbfaab6ed6bb3e8865cd8dd60375fbdc39203a862 (diff)
Support Open Watcom C on Linux (as well as Windows).
-rw-r--r--CHANGES3
-rw-r--r--include/curl/curl.h2
-rw-r--r--lib/if2ip.c3
3 files changed, 6 insertions, 2 deletions
diff --git a/CHANGES b/CHANGES
index aa43d9ebd..ed1213cb5 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 349a37714..8182e9c28 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 18696e9e7..94a09c11e 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>