X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/28b519c93b6db30b6520d46f8cd65160213fddd2..HEAD:/rsync.h

diff --git a/rsync.h b/rsync.h
index 99c7d6c4..57e3d79d 100644
--- a/rsync.h
+++ b/rsync.h
@@ -383,6 +383,14 @@ enum delret {
 #define CAN_CHMOD_SYMLINK 1
 #endif
 
+#ifdef HAVE_UTIMENSAT
+#ifdef HAVE_STRUCT_STAT_ST_MTIM_TV_NSEC
+#define ST_MTIME_NSEC st_mtim.tv_nsec
+#elif defined(HAVE_STRUCT_STAT_ST_MTIMENSEC)
+#define ST_MTIME_NSEC st_mtimensec
+#endif
+#endif
+
 #ifdef HAVE_SYS_SELECT_H
 #include <sys/select.h>
 #endif
@@ -666,7 +674,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
@@ -1034,7 +1044,7 @@ extern int errno;
 
 #ifdef HAVE_READLINK
 #define SUPPORT_LINKS 1
-#ifndef NO_SYMLINK_XATTRS
+#if !defined NO_SYMLINK_XATTRS && !defined NO_SYMLINK_USER_XATTRS
 #define do_readlink(path, buf, bufsiz) readlink(path, buf, bufsiz)
 #endif
 #endif