X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/1dcf3b4345046c955c45b10192242547ffd38ef4..afc65a5acffdf2a3e8c4b35b4d8ace3aa42773bc:/rsync.h

diff --git a/rsync.h b/rsync.h
index f62dcc0e..b65e53b1 100644
--- a/rsync.h
+++ b/rsync.h
@@ -145,9 +145,12 @@
 #define ITEM_REPORT_OWNER (1<<5)
 #define ITEM_REPORT_GROUP (1<<6)
 #define ITEM_IS_NEW (1<<7)
+#define ITEM_USING_ALT_BASIS (1<<8)
+/* These are outside the range of the transmitted flags. */
+#define ITEM_NO_DEST_AND_NO_UPDATE (1<<16) /* used by itemize() */
+#define ITEM_MISSING_DATA (1<<16)	   /* used by log_formatted() */
+#define ITEM_DELETED (1<<17)		   /* used by log_formatted() */
 
-#define ITEM_MISSING_DATA (1<<16) /* these are outside the transmitted flags */
-#define ITEM_DELETED (1<<17)
 
 /* Log-message categories.  FLOG and FCLIENT are only used on the daemon
  * side for custom logging -- they don't get sent over the socket. */
@@ -297,7 +300,7 @@ enum msgcode {
 
 #ifdef MAJOR_IN_MKDEV
 #include <sys/mkdev.h>
-# if !defined makedev && defined mkdev
+# if !defined makedev && (defined mkdev || defined _WIN32 || defined __WIN32__)
 #  define makedev mkdev
 # endif
 #elif defined MAJOR_IN_SYSMACROS