From 336f996842cb9006363a69c12b75e2d99e978eae Mon Sep 17 00:00:00 2001
From: yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Thu, 15 Jan 2009 15:36:48 +0000
Subject: [PATCH] merges r21484 from trunk into ruby_1_9_1. 	*
 ext/socket/{getaddrinfo,getnameinfo}.c: need to include ws2tcpip.h 	  on
 Windows.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21545 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog                | 5 +++++
 ext/socket/getaddrinfo.c | 1 +
 ext/socket/getnameinfo.c | 1 +
 3 files changed, 7 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index a2f8d4285a..fc314051ca 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Jan 13 12:10:42 2009  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* ext/socket/{getaddrinfo,getnameinfo}.c: need to include ws2tcpip.h
+	  on Windows.
+
 Tue Jan 13 03:07:28 2009  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* instruby.rb: require "tool/mdoc2man.rb" before chdir if needed.
diff --git a/ext/socket/getaddrinfo.c b/ext/socket/getaddrinfo.c
index 837a506a72..de16b9fb12 100644
--- a/ext/socket/getaddrinfo.c
+++ b/ext/socket/getaddrinfo.c
@@ -64,6 +64,7 @@
 #include <unistd.h>
 #else
 #include <winsock2.h>
+#include <ws2tcpip.h>
 #include <io.h>
 #endif
 #include <string.h>
diff --git a/ext/socket/getnameinfo.c b/ext/socket/getnameinfo.c
index aee81b5356..3ea2f7251f 100644
--- a/ext/socket/getnameinfo.c
+++ b/ext/socket/getnameinfo.c
@@ -57,6 +57,7 @@
 #endif
 #ifdef _WIN32
 #include <winsock2.h>
+#include <ws2tcpip.h>
 #define snprintf _snprintf
 #endif