aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--io.c4
2 files changed, 8 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index f8c28b945d..9e51dbc221 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Dec 13 18:35:33 2010 NARUSE, Yui <naruse@ruby-lang.org>
+
+ * io.c: define USE_SENDFILE on FreeBSD or DragonFly BSD.
+ Remove Mac OS X because its argument is different from them.
+
Mon Dec 13 12:00:09 2010 Tanaka Akira <akr@fsij.org>
* file.c: parenthesize macro arguments.
diff --git a/io.c b/io.c
index 9d75d0cd92..30767af695 100644
--- a/io.c
+++ b/io.c
@@ -8216,7 +8216,9 @@ simple_sendfile(int out_fd, int in_fd, off_t *offset, off_t count)
return sendfile(out_fd, in_fd, offset, (size_t)count);
}
-# elif defined(__FreeBSD__) || defined(__DragonFly__) || defined(__APPLE__)
+# elif defined(__FreeBSD__) || defined(__DragonFly__)
+# define USE_SENDFILE
+
# ifdef HAVE_SYS_UIO_H
# include <sys/uio.h>
# endif