[SCM] The rsync repository. - branch master updated

Rsync CVS commit messages rsync-cvs at lists.samba.org
Mon May 16 09:31:19 MDT 2011


The branch, master has been updated
       via  ac30d22 Check for linux/falloc.h header file.
      from  8bcd6a4 Abort if the cd fails.

;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit ac30d22ae5bd4e1a1282e401425fe28cec6a08bb
Author: Wayne Davison <wayned at samba.org>
Date:   Mon May 16 08:26:40 2011 -0700

    Check for linux/falloc.h header file.

-----------------------------------------------------------------------

Summary of changes:
 configure.ac |    2 +-
 rsync.h      |    2 ++
 2 files changed, 3 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/configure.ac b/configure.ac
index 302788c..b160366 100644
--- a/configure.ac
+++ b/configure.ac
@@ -339,7 +339,7 @@ AC_CHECK_HEADERS(sys/fcntl.h sys/select.h fcntl.h sys/time.h sys/unistd.h \
     sys/un.h sys/attr.h mcheck.h arpa/inet.h arpa/nameser.h locale.h \
     netdb.h malloc.h float.h limits.h iconv.h libcharset.h langinfo.h \
     sys/acl.h acl/libacl.h attr/xattr.h sys/xattr.h sys/extattr.h \
-    popt.h popt/popt.h)
+    popt.h popt/popt.h linux/falloc.h)
 AC_HEADER_MAJOR
 
 AC_CACHE_CHECK([if makedev takes 3 args],rsync_cv_MAKEDEV_TAKES_3_ARGS,[
diff --git a/rsync.h b/rsync.h
index 99c7d6c..84d1287 100644
--- a/rsync.h
+++ b/rsync.h
@@ -666,7 +666,9 @@ struct ht_int64_node {
 #endif
 
 #if defined HAVE_FALLOCATE || HAVE_SYS_FALLOCATE
+#ifdef HAVE_LINUX_FALLOC_H
 #include <linux/falloc.h>
+#endif
 #ifdef FALLOC_FL_KEEP_SIZE
 #define SUPPORT_PREALLOCATION 1
 #elif defined HAVE_FTRUNCATE


-- 
The rsync repository.


More information about the rsync-cvs mailing list