X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/82306bf6d644ceca9ef07b4989fb317fc8a613e5..1e9f155adea9c9dca7b420749cd8a92203d9427b:/rsync.h

diff --git a/rsync.h b/rsync.h
index b9bca21c..cef172a1 100644
--- a/rsync.h
+++ b/rsync.h
@@ -39,7 +39,7 @@
 #define SAME_TIME (1<<7)
 
 /* update this if you make incompatible changes */
-#define PROTOCOL_VERSION 14
+#define PROTOCOL_VERSION 15
 #define MIN_PROTOCOL_VERSION 10
 #define MAX_PROTOCOL_VERSION 20
 
@@ -163,6 +163,10 @@
 #include "lib/getopt.h"
 #endif
 
+/* these are needed for the uid/gid mapping code */
+#include <pwd.h>
+#include <grp.h>
+
 #ifndef S_IFLNK
 #define S_IFLNK  0120000
 #endif
@@ -248,6 +252,16 @@ struct map_struct {
   int fd,size,p_size,p_offset,p_len;
 };
 
+/* we need this function because of the silly way in which duplicate
+   entries are handled in the file lists - we can't change this
+   without breaking existing versions */
+static int flist_up(struct file_list *flist, int i)
+{
+	while (!flist->files[i].name) i++;
+	return i;
+}
+
+
 #include "byteorder.h"
 #include "version.h"
 #include "proto.h"
@@ -319,5 +333,21 @@ extern int errno;
 #define S_IWUSR 0200
 #endif
 
+#ifndef S_ISBLK
+#define S_ISBLK(mode) (((mode) & (_S_IFMT)) == (_S_IFBLK))
+#endif
+
+#ifndef S_ISCHR
+#define S_ISCHR(mode) (((mode) & (_S_IFMT)) == (_S_IFCHR))
+#endif
+
+#ifndef S_ISDIR
+#define S_ISDIR(mode) (((mode) & (_S_IFMT)) == (_S_IFDIR))
+#endif
+
+#ifndef S_ISREG
+#define S_ISREG(mode) (((mode) & (_S_IFMT)) == (_S_IFREG))
+#endif
+
 #define IS_DEVICE(mode) (S_ISCHR(mode) || S_ISBLK(mode))