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
---
 win32/setup.mak | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'win32/setup.mak')

diff --git a/win32/setup.mak b/win32/setup.mak
index e87d1dbf39..1df2e2ed33 100644
--- a/win32/setup.mak
+++ b/win32/setup.mak
@@ -41,8 +41,8 @@ MAKE = nmake
 srcdir = $(srcdir:\=/)
 prefix = $(prefix:\=/)
 EXTSTATIC = $(EXTSTATIC)
-!if "$(USE_WINSOCK2)" != "0"
-USE_WINSOCK2 = 1
+!if defined(USE_WINSOCK2)
+USE_WINSOCK2 = $(USE_WINSOCK2)
 !endif
 !if defined(RDOCTARGET)
 RDOCTARGET = $(RDOCTARGET)
-- 
cgit v1.2.3