Defines moved to config-win32.h.

diff --git a/ares/Makefile.m32 b/ares/Makefile.m32
index f762b2b..11d9818 100644 (file)
--- a/ares/Makefile.m32
+++ b/ares/Makefile.m32
@@ -14,10 +14,7 @@ RANLIB = ranlib
 
 LIB=libcares.a
 CC=gcc
-CFLAGS=-O2 -Wall -DHAVE_GETOPT_H -DHAVE_AF_INET6 -DHAVE_PF_INET6 \
-       -DHAVE_STRUCT_IN6_ADDR -DHAVE_STRUCT_SOCKADDR_IN6 -DHAVE_STRUCT_ADDRINFO \
-       -DHAVE_IOCTLSOCKET
-
+CFLAGS=-O2 -Wall
 LDFLAGS=-s
 LIBS=-lwsock32
 

diff --git a/ares/Makefile.vc6 b/ares/Makefile.vc6
index 32f46a9..b6292e1 100644 (file)
--- a/ares/Makefile.vc6
+++ b/ares/Makefile.vc6
@@ -43,10 +43,6 @@ CFLAGS  = $(CFLAGS) -O2 -Og
 LDFLAGS = $(LDFLAGS) -release
 !endif
 
-CFLAGS = $(CFLAGS) -DHAVE_AF_INET6 -DHAVE_PF_INET6 \
-         -DHAVE_STRUCT_IN6_ADDR -DHAVE_STRUCT_SOCKADDR_IN6 -DHAVE_STRUCT_ADDRINFO \
-         -DHAVE_IOCTLSOCKET
-
 OBJECTS = $(OBJ_DIR)\ares_fds.obj              \
           $(OBJ_DIR)\ares_process.obj          \
           $(OBJ_DIR)\ares_free_hostent.obj     \