summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-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