Got rid of the erroneous --dry-run short-circuit in the directory

[rsync/rsync.git] / rsync.h

diff --git a/rsync.h b/rsync.h
index c06ffac..2a9918b 100644 (file)
--- a/rsync.h
+++ b/rsync.h
@@ -129,6 +129,11 @@
 #define FNAMECMP_PARTIAL_DIR   0x81
 #define FNAMECMP_BACKUP        0x82
 
+/* For calling delete_file() */
+#define DEL_DIR                        (1<<0)
+#define DEL_NO_RECURSE         (1<<1)
+#define DEL_TERSE              (1<<2)
+
 
 /* Log-message categories.  FLOG is only used on the daemon side to
  * output messages to the log file. */
@@ -332,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
@@ -370,8 +364,8 @@ enum msgcode {
  */ 
 
 struct idev {
-       uint64 inode;
-       uint64 dev;
+       int64 inode;
+       int64 dev;
 };
 
 #ifndef MIN