From: Gisle Vanem <gvanem@broadpark.no>
Date: Sat, 16 Aug 2008 16:42:44 +0000 (+0000)
Subject: Support Watt-32 under Win32.
X-Git-Tag: curl-7_19_0~129
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=65b0f6049d25d0a191014eb902725fd42cf79d4f;p=thirdparty%2Fcurl.git

Support Watt-32 under Win32.
---

diff --git a/ares/acountry.c b/ares/acountry.c
index 14efa07299..542c016c77 100644
--- a/ares/acountry.c
+++ b/ares/acountry.c
@@ -47,7 +47,7 @@
 #include <strings.h>
 #endif
 
-#if defined(WIN32)
+#if defined(WIN32) && !defined(WATT32)
   #include <winsock.h>
 #else
   #include <arpa/inet.h>
@@ -90,7 +90,7 @@ int main(int argc, char **argv)
   ares_channel channel;
   int    ch, status;
 
-#ifdef WIN32
+#if defined(WIN32) && !defined(WATT32)
   WORD wVersionRequested = MAKEWORD(USE_WINSOCK,USE_WINSOCK);
   WSADATA wsaData;
   WSAStartup(wVersionRequested, &wsaData);
@@ -107,6 +107,8 @@ int main(int argc, char **argv)
       case 'v':
         verbose++;
         break;
+      case 't':
+        use_vc = 1;
       case 'h':
       case '?':
       default:
@@ -158,7 +160,7 @@ int main(int argc, char **argv)
   wait_ares(channel);
   ares_destroy(channel);
 
-#ifdef WIN32
+#if defined(WIN32) && !defined(WATT32)
   WSACleanup();
 #endif