From b17e32baa750d9ce9459e06b144e4ed376dbaa32 Mon Sep 17 00:00:00 2001
From: Gisle Vanem <gvanem@broadpark.no>
Date: Fri, 20 Aug 2004 13:45:26 +0000
Subject: Changes for Watt-32 on Windows. I've assumed Configure sets the
 required HAVE_xx defines for non-DOS/Win targets.

---
 ares/ares_init.c | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

(limited to 'ares/ares_init.c')

diff --git a/ares/ares_init.c b/ares/ares_init.c
index 0fbad973b..1d4a015ad 100644
--- a/ares/ares_init.c
+++ b/ares/ares_init.c
@@ -16,19 +16,25 @@
 #include "setup.h"
 #include <sys/types.h>
 
-#ifdef WIN32
+#if defined(WIN32) && !defined(WATT32)
 #include "nameser.h"
 #include <iphlpapi.h>
 #include <malloc.h>
+
 #else
 #include <sys/param.h>
+#ifdef HAVE_SYS_TIME_H
 #include <sys/time.h>
+#endif
+
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <netdb.h>
 #include <arpa/nameser.h>
+#ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
+#endif
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -39,6 +45,10 @@
 #include "ares.h"
 #include "ares_private.h"
 
+#ifdef WATT32
+#undef WIN32  /* Redefined in MingW/MSVC headers */
+#endif
+
 static int init_by_options(ares_channel channel, struct ares_options *options,
 			   int optmask);
 static int init_by_environment(ares_channel channel);
-- 
cgit v1.2.3