summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Loukissas <alex@maginatics.com>2013-05-02 20:46:48 (GMT)
committerDaniel Stenberg <daniel@haxx.se>2013-05-02 20:46:48 (GMT)
commitdf55bfac79a982af93a25545ab2eb96e0d54e784 (patch)
treea90fa3e2a772fe83cb6a04fc08dde8273a8f4450
parent3f0ec4733ede034194a09aa8f6b9eb960a492260 (diff)
downloadc-ares-df55bfac79a982af93a25545ab2eb96e0d54e784.zip
c-ares-df55bfac79a982af93a25545ab2eb96e0d54e784.tar.gz
c-ares-df55bfac79a982af93a25545ab2eb96e0d54e784.tar.bz2
build: fix build on msvc11
-rw-r--r--Makefile.inc3
-rw-r--r--Makefile.msvc2
2 files changed, 3 insertions, 2 deletions
diff --git a/Makefile.inc b/Makefile.inc
index 6a6363c..c38c921 100644
--- a/Makefile.inc
+++ b/Makefile.inc
@@ -53,6 +53,7 @@ HHEADERS = ares.h \
ares_data.h \
ares_dns.h \
ares_getenv.h \
+ ares_inet_net_pton.h \
ares_iphlpapi.h \
ares_ipv6.h \
ares_library_init.h \
@@ -66,8 +67,6 @@ HHEADERS = ares.h \
ares_version.h \
ares_writev.h \
bitncmp.h \
- inet_net_pton.h \
- inet_ntop.h \
nameser.h \
ares_setup.h \
setup_once.h
diff --git a/Makefile.msvc b/Makefile.msvc
index 4fc34ac..c83dd91 100644
--- a/Makefile.msvc
+++ b/Makefile.msvc
@@ -123,6 +123,8 @@ CC_VERS_NUM = 110
CC_VERS_NUM = 110
!ELSEIF "$(_NMAKE_VER)" == "11.00.51106.1"
CC_VERS_NUM = 110
+!ELSEIF "$(_NMAKE_VER)" == "11.00.60315.1"
+CC_VERS_NUM = 110
!ELSE
! MESSAGE Unknown value for _NMAKE_VER macro: "$(_NMAKE_VER)"
! MESSAGE Please, report this condition on the c-ares development