X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/90b13cf60687c4d2e18964423cd44abab6500167..064071011597ccab5486a2a459e425f15b4126cd:/rsync.h

diff --git a/rsync.h b/rsync.h
index b6038f73..40061b37 100644
--- a/rsync.h
+++ b/rsync.h
@@ -141,7 +141,9 @@
 #define ITEM_REPORT_PERMS (1<<4)
 #define ITEM_REPORT_OWNER (1<<5)
 #define ITEM_REPORT_GROUP (1<<6)
-#define ITEM_REPORT_XATTRS (1<<7)
+#define ITEM_REPORT_ATIME (1<<7)
+#define ITEM_REPORT_ACL (1<<8)
+#define ITEM_REPORT_XATTR (1<<9)
 #define ITEM_BASIS_TYPE_FOLLOWS (1<<11)
 #define ITEM_XNAME_FOLLOWS (1<<12)
 #define ITEM_IS_NEW (1<<13)
@@ -560,6 +562,7 @@ struct sum_buf {
 	OFF_T offset;		/**< offset in file of this chunk */
 	int32 len;		/**< length of chunk of file */
 	uint32 sum1;	        /**< simple checksum */
+	int32 chain;		/**< next hash-table collision */
 	short flags;		/**< flag bits */
 	char sum2[SUM_LENGTH];	/**< checksum  */
 };
@@ -648,6 +651,13 @@ struct chmod_mode_struct;
 #include "lib/permstring.h"
 #include "lib/addrinfo.h"
 
+#if !defined __GNUC__ || defined __APPLE__
+/* Apparently the OS X port of gcc gags on __attribute__.
+ *
+ * <http://www.opensource.apple.com/bugs/X/gcc/2512150.html> */
+#define __attribute__(x)
+#endif
+
 #define UNUSED(x) x __attribute__((__unused__))
 
 #include "proto.h"
@@ -693,7 +703,7 @@ extern int errno;
 #define SUPPORT_HARD_LINKS 1
 #endif
 
-#if defined HAVE_SIGACTION && defined HAVE_SIGPROCMASK
+#ifdef HAVE_SIGACTION
 #define SIGACTION(n,h) sigact.sa_handler=(h), sigaction((n),&sigact,NULL)
 #define signal(n,h) we_need_to_call_SIGACTION_not_signal(n,h)
 #else
@@ -806,14 +816,6 @@ extern int errno;
 /* handler for null strings in printf format */
 #define NS(s) ((s)?(s):"<NULL>")
 
-#if !defined __GNUC__ || defined __APPLE__
-/* Apparently the OS X port of gcc gags on __attribute__.
- *
- * <http://www.opensource.apple.com/bugs/X/gcc/2512150.html> */
-#define __attribute__(x)
-
-#endif
-
 /* Convenient wrappers for malloc and realloc.  Use them. */
 #define new(type) ((type *)malloc(sizeof(type)))
 #define new_array(type, num) ((type *)_new_array(sizeof(type), (num)))