summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-12-31 09:19:05 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-12-31 09:19:05 +0000
commit070489975d3a61aeebeedbc5a53d9a99197ca984 (patch)
tree3899b4915d7590102a46a44ddf958c9074502a90
parent96abe7f35e3e03a861ea2b1bf7cc6e62a0615b3c (diff)
* ext/socket/rubysocket.h: include addrinfo.h only when using our own
getaddrinfo.c. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@26214 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--ext/socket/rubysocket.h2
2 files changed, 7 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 53c2e16..3973846 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Dec 31 18:18:55 2009 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * ext/socket/rubysocket.h: include addrinfo.h only when using our own
+ getaddrinfo.c.
+
Thu Dec 31 14:20:11 2009 NAKAMURA Usaku <usa@ruby-lang.org>
* process.c (save_redirect_fd): consider EBADF that the fd is not used.
diff --git a/ext/socket/rubysocket.h b/ext/socket/rubysocket.h
index 9f1bd6a..5164488 100644
--- a/ext/socket/rubysocket.h
+++ b/ext/socket/rubysocket.h
@@ -97,7 +97,9 @@
*/
#define pseudo_AF_FTIP pseudo_AF_RTIP
+#ifndef HAVE_GETADDRINFO
#include "addrinfo.h"
+#endif
#include "sockport.h"
#ifndef NI_MAXHOST