Commit b17e32ba authored by Gisle Vanem's avatar Gisle Vanem
Browse files

Changes for Watt-32 on Windows. I've assumed Configure 

sets the required HAVE_xx defines for non-DOS/Win targets.
parent cd52b9f0

ares/ares.h

+7 −4
Original line number Diff line number Diff line
@@ -27,7 +27,10 @@ 
#include <sys/select.h>

#endif



#ifdef WIN32

#if defined(WATT32)

  #include <netinet/in.h>

  #include <tcp.h>

#elif defined(WIN32)

  #include <winsock.h>

  #include <windows.h>

#else

ares/ares__close_sockets.c

+2 −2
Original line number Diff line number Diff line
@@ -16,10 +16,10 @@ 
#include "setup.h"



#include <stdlib.h>

#ifdef WIN32

#else

#ifdef HAVE_UNISTD_H

#include <unistd.h>

#endif



#include "ares.h"

#include "ares_private.h"

ares/ares__get_hostent.c

+1 −3
Original line number Diff line number Diff line
@@ -16,9 +16,7 @@ 
#include "setup.h"

#include <sys/types.h>



#ifdef WIN32



#else

#if !defined(WIN32) || defined(WATT32)

#include <sys/socket.h>

#include <netinet/in.h>

#include <arpa/inet.h>

ares/ares_expand_name.c

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 
#include "setup.h"

#include <sys/types.h>



#ifdef WIN32

#if defined(WIN32) && !defined(WATT32)

#include "nameser.h"

#else

#include <netinet/in.h>

ares/ares_expand_string.c

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 
#include "setup.h"

#include <sys/types.h>



#ifdef WIN32

#if defined(WIN32) && !defined(WATT32)

#include "nameser.h"

#else

#include <netinet/in.h>