summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCedric BAIL <cedric.bail@free.fr>2012-09-14 02:09:26 +0000
committerCedric BAIL <cedric.bail@free.fr>2012-09-14 02:09:26 +0000
commit03aedf70ae8ecb7ed1e9acfbf0140fd936a77ab5 (patch)
tree1107df80080e1ed731ed08bbfe53b72c3433f660
parent0d8ec57a5f36801806732e6fd0a0bd3e03b2c78a (diff)
eio: backport r76634.eio-1.0
SVN revision: 76635
-rw-r--r--ChangeLog4
-rw-r--r--src/lib/eio_file.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index e6148a4..a8a6012 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -17,3 +17,7 @@
172012-09-10 Cedric Bail 172012-09-10 Cedric Bail
18 18
19 * Fix monitor shutdown when mainloop did never run. 19 * Fix monitor shutdown when mainloop did never run.
20
212012-09-14 Cedric Bail
22
23 * Fix build with xattr without splice.
diff --git a/src/lib/eio_file.c b/src/lib/eio_file.c
index f1a5579..84bc4f4 100644
--- a/src/lib/eio_file.c
+++ b/src/lib/eio_file.c
@@ -669,7 +669,7 @@ eio_file_copy_do(Ecore_Thread *thread, Eio_File_Progress *copy)
669 } 669 }
670 else 670 else
671 { 671 {
672#ifdef HAVE_XATTR 672#if defined HAVE_XATTR && defined HAVE_SPLICE
673 _eio_file_copy_xattr(thread, copy, in, out); 673 _eio_file_copy_xattr(thread, copy, in, out);
674#endif 674#endif
675 } 675 }