X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/7842418b7b87c4c78ad8ad06fec44150c8aa0956..e32db5c9aade691a13a200e867a812099bfdcdae:/rsync.h

diff --git a/rsync.h b/rsync.h
index 0c04679e..88a503f6 100644
--- a/rsync.h
+++ b/rsync.h
@@ -133,8 +133,9 @@
 
 /* For calling delete_file() */
 #define DEL_DIR 		(1<<0)
-#define DEL_RECURSE		(1<<1) /* recurse even w/o --force */
-#define DEL_TERSE		(1<<2)
+#define DEL_NO_RECURSE		(1<<1)
+#define DEL_FORCE_RECURSE	(1<<2) /* recurse even w/o --force */
+#define DEL_TERSE		(1<<3)
 
 
 /* Log-message categories.  FLOG is only used on the daemon side to
@@ -293,7 +294,7 @@ enum msgcode {
 #define uchar unsigned char
 #endif
 
-#if HAVE_UNSIGNED_CHAR
+#if SIGNED_CHAR_OK
 #define schar signed char
 #else
 #define schar char
@@ -325,6 +326,12 @@ enum msgcode {
 #define STRUCT_STAT struct stat
 #endif
 
+/* CAVEAT: on some systems, int64 will really be a 32-bit integer IFF
+ * that's the maximum size the file system can handle and there is no
+ * 64-bit type available.  The rsync source must therefore take steps
+ * to ensure that any code that really requires a 64-bit integer has
+ * it (e.g. the checksum code uses two 32-bit integers for its 64-bit
+ * counter). */
 #if HAVE_OFF64_T
 #define int64 off64_t
 #elif (SIZEOF_LONG == 8) 
@@ -539,6 +546,8 @@ struct stats {
 	int64 total_read;
 	int64 literal_data;
 	int64 matched_data;
+	int64 flist_buildtime;
+	int64 flist_xfertime;
 	int flist_size;
 	int num_files;
 	int num_transferred_files;