From 9e469fbac28ebeedd3c5f9272c2552daacc59c29 Mon Sep 17 00:00:00 2001
From: knu <knu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Fri, 6 Jun 2008 12:19:21 +0000
Subject: Merge changes from ruby_1_8 that fixes build with Visual C++ 8 with
 Winsock2.

* win32/Makefile.sub (COMMON_HEADERS): include ws2tcpip.h.

* ext/socket/addrinfo.h (addrinfo, getaddrinfo, getnameinfo,
  freehostent, freeaddrinfo): undef before define because these are
  macros in some versions of Windows SDK.

* win32/setup.mak: maybe commit miss.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@16866 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ext/socket/addrinfo.h | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'ext/socket/addrinfo.h')

diff --git a/ext/socket/addrinfo.h b/ext/socket/addrinfo.h
index a22615ee00..e93adafba6 100644
--- a/ext/socket/addrinfo.h
+++ b/ext/socket/addrinfo.h
@@ -61,10 +61,15 @@
 #undef NI_NUMERICSERV
 #undef NI_DGRAM
 
+#undef addrinfo
 #define addrinfo addrinfo__compat
+#undef getaddrinfo
 #define getaddrinfo getaddrinfo__compat
+#undef getnameinfo
 #define getnameinfo getnameinfo__compat
+#undef freehostent
 #define freehostent freehostent__compat
+#undef freeaddrinfo
 #define freeaddrinfo freeaddrinfo__compat
 
 #ifndef __P
-- 
cgit v1.2.3