From 7d481b5423de7312f3fe0f79539fbe342d69dae8 Mon Sep 17 00:00:00 2001 From: naruse Date: Mon, 13 Dec 2010 09:37:09 +0000 Subject: [PATCH] * io.c: define USE_SENDFILE on FreeBSD or DragonFly BSD. Remove Mac OS X because its argument is different from them. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30193 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ io.c | 4 +++- 2 files changed, 8 insertions(+), 1 deletion(-) 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 + + * 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 * 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 # endif