aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--configure.in2
-rw-r--r--ext/socket/socket.c4
3 files changed, 10 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index cdd2f00d84..c4a5d642c7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Dec 27 10:44:03 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * ext/socket/socket.c: a patch to support IRIX from Andrew
+ Thompson <andrew@hijacked.us> in [ruby-core:14447].
+
Thu Dec 27 02:25:45 2007 NAKAMURA Usaku <usa@ruby-lang.org>
* lib/mkmf.rb (create_tmpsrc): retry to create file if Errno::EACCES
diff --git a/configure.in b/configure.in
index f0cdc2ee5a..82f85844e3 100644
--- a/configure.in
+++ b/configure.in
@@ -566,7 +566,7 @@ AC_HEADER_SYS_WAIT
AC_CHECK_HEADERS(stdlib.h string.h unistd.h limits.h sys/file.h sys/ioctl.h sys/syscall.h\
fcntl.h sys/fcntl.h sys/select.h sys/time.h sys/times.h sys/param.h\
syscall.h pwd.h grp.h a.out.h utime.h memory.h direct.h sys/resource.h \
- sys/mkdev.h sys/utime.h netinet/in_systm.h float.h ieeefp.h pthread.h \
+ sys/mkdev.h sys/utime.h xti.h netinet/in_systm.h float.h ieeefp.h pthread.h \
ucontext.h intrinsics.h langinfo.h locale.h)
dnl Check additional types.
diff --git a/ext/socket/socket.c b/ext/socket/socket.c
index 29fa71f8ae..3db05df7c8 100644
--- a/ext/socket/socket.c
+++ b/ext/socket/socket.c
@@ -25,6 +25,10 @@
#include <sys/uio.h>
#endif
+#ifdef HAVE_XTI_H
+#include <xti.h>
+#endif
+
#ifndef _WIN32
#if defined(__BEOS__)
# include <net/socket.h>