X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/3a6a366fc5ac1f418446128de50b4f2a174399fc..0a25de67e99a5eee1b35b0e5ddb359f9a3500ce4:/rsync.h diff --git a/rsync.h b/rsync.h index 9c0e24c7..9f517ade 100644 --- a/rsync.h +++ b/rsync.h @@ -39,11 +39,11 @@ #define SAME_TIME (1<<7) /* update this if you make incompatible changes */ -#define PROTOCOL_VERSION 16 +#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 SPARSE_WRITE_SIZE (1024) #define WRITE_SIZE (32*1024) #define CHUNK_SIZE (32*1024) #define MAX_MAP_SIZE (4*1024*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)) @@ -257,7 +262,7 @@ struct map_struct { /* 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;