X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/2d0bb8eb0fb3d11445ab2a9657130145eaa8383e..dd04a03440be7c04ec7c3005d5fd92ec03311358:/rsync.h diff --git a/rsync.h b/rsync.h index d8c0d68a..a669276b 100644 --- a/rsync.h +++ b/rsync.h @@ -39,9 +39,9 @@ #define SAME_TIME (1<<7) /* update this if you make incompatible changes */ -#define PROTOCOL_VERSION 15 +#define PROTOCOL_VERSION 17 #define MIN_PROTOCOL_VERSION 11 -#define MAX_PROTOCOL_VERSION 20 +#define MAX_PROTOCOL_VERSION 30 #define SPARSE_WRITE_SIZE (4*1024) #define WRITE_SIZE (32*1024) @@ -193,6 +193,11 @@ #define uint32 unsigned int32 #endif +#ifdef HAVE_LONGLONG +#define int64 long long +#else +#define int64 off_t +#endif #ifndef MIN #define MIN(a,b) ((a)<(b)?(a):(b)) @@ -249,14 +254,15 @@ struct sum_struct { }; struct map_struct { - char *map,*p; - int fd,size,p_size,p_offset,p_len; + char *map,*p; + int fd,p_size,p_len; + off_t size, p_offset; }; /* 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) +static inline int flist_up(struct file_list *flist, int i) { while (!flist->files[i]->basename) i++; return i;