From ae78bed101333c55c5c052fc156baaac39d61622 Mon Sep 17 00:00:00 2001 From: Cedric BAIL Date: Fri, 14 Sep 2012 02:06:24 +0000 Subject: [PATCH] eio: fix build with xattr and without splice. Fix bug #1511 reported by Sleep Walker. SVN revision: 76634 --- legacy/eio/ChangeLog | 4 ++++ legacy/eio/NEWS | 1 + legacy/eio/src/lib/eio_file.c | 2 +- 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/legacy/eio/ChangeLog b/legacy/eio/ChangeLog index d576945865..ffe62fce30 100644 --- a/legacy/eio/ChangeLog +++ b/legacy/eio/ChangeLog @@ -43,3 +43,7 @@ 2012-09-10 Cedric Bail * Fix monitor shutdown when mainloop did never run. + +2012-09-14 Cedric Bail + + * Fix build with xattr without splice. diff --git a/legacy/eio/NEWS b/legacy/eio/NEWS index 8a42fa7b9f..fe55f37550 100644 --- a/legacy/eio/NEWS +++ b/legacy/eio/NEWS @@ -7,6 +7,7 @@ Additions: Fixes: - fix monitor shutdown when mainloop did never run. + - fix build with xattr and without splice. Improvements: diff --git a/legacy/eio/src/lib/eio_file.c b/legacy/eio/src/lib/eio_file.c index 247546fcd6..31122d0c1f 100644 --- a/legacy/eio/src/lib/eio_file.c +++ b/legacy/eio/src/lib/eio_file.c @@ -669,7 +669,7 @@ eio_file_copy_do(Ecore_Thread *thread, Eio_File_Progress *copy) } else { -#ifdef HAVE_XATTR +#if defined HAVE_XATTR && defined HAVE_SPLICE _eio_file_copy_xattr(thread, copy, in, out); #endif }