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

More patches for Watt-32 on Win32; don't include "nameser.h".

parent fa83a057

ares/ares_gethostbyaddr.c

+6 −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 <sys/socket.h>
@@ -28,9 +28,14 @@ 
#include <stdio.h>

#include <stdlib.h>

#include <string.h>



#include "ares.h"

#include "ares_private.h"



#ifdef WATT32

#undef WIN32

#endif



struct addr_query {

  /* Arguments passed to ares_gethostbyaddr() */

  ares_channel channel;

ares/ares_gethostbyname.c

+6 −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 <sys/socket.h>
@@ -30,9 +30,14 @@ 
#include <stdlib.h>

#include <string.h>

#include <ctype.h>



#include "ares.h"

#include "ares_private.h"



#ifdef WATT32

#undef WIN32

#endif



struct host_query {

  /* Arguments passed to ares_gethostbyname() */

  ares_channel channel;

ares/ares_mkquery.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_parse_a_reply.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 <sys/socket.h>

ares/ares_parse_ptr_reply.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 <sys/socket.h>