X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/eb1accaa9197bb157870601b208c8f35778f3c32..65e4cda05976751030ccf280c96edb627584a496:/rsync.h

diff --git a/rsync.h b/rsync.h
index 2db12798..cdb9b2a7 100644
--- a/rsync.h
+++ b/rsync.h
@@ -41,7 +41,7 @@
 
 /* These flags are only used during the flist transfer. */
 
-#define XMIT_TOP_DIR (1<<0)
+#define XMIT_DEL_START (1<<0)
 #define XMIT_SAME_MODE (1<<1)
 #define XMIT_EXTENDED_FLAGS (1<<2)
 #define XMIT_SAME_RDEV_pre28 XMIT_EXTENDED_FLAGS /* Only in protocols < 28 */
@@ -57,7 +57,7 @@
 
 /* These flags are used in the live flist data. */
 
-#define FLAG_TOP_DIR (1<<0)
+#define FLAG_DEL_START (1<<0)
 #define FLAG_HLINK_EOL (1<<1)	/* generator only */
 #define FLAG_MOUNT_POINT (1<<2)	/* sender only */
 
@@ -130,8 +130,8 @@
 #define FNAMECMP_BACKUP 	0x82
 
 /* For calling delete_file() */
-#define DEL_DIR			(1<<0)
-#define DEL_NO_RECURSE		(1<<1)
+#define DEL_DIR 		(1<<0)
+#define DEL_RECURSE		(1<<1) /* recurse even w/o --force */
 #define DEL_TERSE		(1<<2)
 
 
@@ -337,17 +337,6 @@ enum msgcode {
 #define INT64_IS_OFF_T
 #endif
 
-#if (SIZEOF_LONG == 8) 
-#define uint64 unsigned long
-#elif (SIZEOF_INT == 8) 
-#define uint64 unsigned int
-#elif HAVE_LONGLONG
-#define uint64 unsigned long long
-#else
-/* As long as it gets... */
-#define uint64 unsigned off_t
-#endif
-
 /* Starting from protocol version 26, we always use 64-bit
  * ino_t and dev_t internally, even if this platform does not
  * allow files to have 64-bit inums.  That's because the
@@ -375,8 +364,8 @@ enum msgcode {
  */ 
 
 struct idev {
-	uint64 inode;
-	uint64 dev;
+	int64 inode;
+	int64 dev;
 };
 
 #ifndef MIN