X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/753b6b4692b381d64f192abdbea01114f41be86d..38cab94d9a62d16ed410e51af114fccf43eb049b:/rsync.h

diff --git a/rsync.h b/rsync.h
index 973840a8..ea8667c2 100644
--- a/rsync.h
+++ b/rsync.h
@@ -106,7 +106,7 @@
 
 #define XFLG_FATAL_ERRORS	(1<<0)
 #define XFLG_DEF_INCLUDE	(1<<1)
-#define XFLG_NO_PREFIXES	(1<<2)
+#define XFLG_WORDS_ONLY 	(1<<2)
 #define XFLG_WORD_SPLIT 	(1<<3)
 
 #define FULL_FLUSH	1
@@ -123,7 +123,7 @@ enum msgcode {
 	MSG_DATA=0,	/* raw data on the multiplexed stream */
 	MSG_ERROR=FERROR, MSG_INFO=FINFO, MSG_LOG=FLOG, /* remote logging */
 	MSG_REDO=4,	/* reprocess indicated flist index */
-	MSG_DONE=5,	/* current phase is done */
+	MSG_DONE=5	/* current phase is done */
 };
 
 #include "errcode.h"
@@ -345,11 +345,14 @@ enum msgcode {
  * device numbers will be truncated.  But it's a kind of silly thing
  * to do anyhow.
  *
- * FIXME: Really we need an unsigned type, and we perhaps ought to
- * cope with platforms on which this is an unsigned int or even a
- * struct.  Later.
+ * FIXME: I don't think the code in flist.c has ever worked on a system
+ * where dev_t is a struct.
  */ 
-#define INO64_T uint64
+
+struct idev {
+	uint64 inode;
+	uint64 dev;
+};
 
 #ifndef MIN
 #define MIN(a,b) ((a)<(b)?(a):(b))
@@ -395,11 +398,6 @@ struct hlink {
 	struct file_struct *next;
 };
 
-struct idev {
-	INO64_T inode;
-	dev_t dev;
-};
-
 #define F_DEV	link_u.idev->dev
 #define F_INODE	link_u.idev->inode
 
@@ -493,6 +491,7 @@ struct map_struct {
 #define MATCHFLG_WILD2_PREFIX	(1<<2) /* pattern starts with '**' */
 #define MATCHFLG_ABS_PATH	(1<<3) /* path-match on absolute path */
 struct exclude_struct {
+	struct exclude_struct *next;
 	char *pattern;
 	int match_flags;
 	int include;
@@ -500,6 +499,12 @@ struct exclude_struct {
 	int slash_cnt;
 };
 
+struct exclude_list_struct {
+	struct exclude_struct *head;
+	struct exclude_struct *tail;
+	char *debug_type;
+};
+
 struct stats {
 	int64 total_size;
 	int64 total_transferred_size;
@@ -756,10 +761,6 @@ int inet_pton(int af, const char *src, void *dst);
 const char *get_panic_action(void);
 #endif
 
-#if !(defined(__hpux) || defined(_hpux) || defined (hpux))
 #define UNUSED(x) x __attribute__((__unused__))
-#else
-#define UNUSED(x) x
-#endif
 
 extern const char *io_write_phase, *io_read_phase;