git.samba.org
/
rsync.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
8bcd6a4
)
Check for linux/falloc.h header file.
author
Wayne Davison
<wayned@samba.org>
Mon, 16 May 2011 15:26:40 +0000
(08:26 -0700)
committer
Wayne Davison
<wayned@samba.org>
Mon, 16 May 2011 15:26:40 +0000
(08:26 -0700)
configure.ac
patch
|
blob
|
history
rsync.h
patch
|
blob
|
history
diff --git
a/configure.ac
b/configure.ac
index 302788ccdb992ab2ab438fd15543508b84ea037b..b160366228182584ed280ac2e1c4f653a313315c 100644
(file)
--- 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 \
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,[
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 99c7d6c46513619bf51435ee7f811510137c8b09..84d1287cd7e48898c292e45228b8fc40d7260d42 100644
(file)
--- a/
rsync.h
+++ b/
rsync.h
@@
-666,7
+666,9
@@
struct ht_int64_node {
#endif
#if defined HAVE_FALLOCATE || HAVE_SYS_FALLOCATE
#endif
#if defined HAVE_FALLOCATE || HAVE_SYS_FALLOCATE
+#ifdef HAVE_LINUX_FALLOC_H
#include <linux/falloc.h>
#include <linux/falloc.h>
+#endif
#ifdef FALLOC_FL_KEEP_SIZE
#define SUPPORT_PREALLOCATION 1
#elif defined HAVE_FTRUNCATE
#ifdef FALLOC_FL_KEEP_SIZE
#define SUPPORT_PREALLOCATION 1
#elif defined HAVE_FTRUNCATE