2 files changed, 7 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 7f2e39ac2e..0ba0358701 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Dec 31 18:16:51 2009  NAKAMURA Usaku  <[email protected]>
+
+	* ext/socket/socket.c: include addrinfo.h only when using our own
+	  getaddrinfo.c.
+
 Thu Dec 31 05:56:38 2009  Nobuyoshi Nakada  <[email protected]>
 
 	* ext/socket/extconf.rb: fix for wide-getaddrinfo option.
diff --git a/ext/socket/socket.c b/ext/socket/socket.c
index 4f8cf07218..0d675bc66b 100644
--- a/ext/socket/socket.c
+++ b/ext/socket/socket.c
@@ -69,7 +69,9 @@
 #ifndef EWOULDBLOCK
 #define EWOULDBLOCK EAGAIN
 #endif
+#ifndef HAVE_GETADDRINFO
 #include "addrinfo.h"
+#endif
 #include "sockport.h"
 
 #if defined(__vms)