X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/22b193328754701c37942f4776116ada880efaef..2f03f956f425f03335005ba743f19b6ed3454248:/rsync.h diff --git a/rsync.h b/rsync.h index deb20a23..b2945133 100644 --- a/rsync.h +++ b/rsync.h @@ -69,6 +69,13 @@ #endif #include + +#ifdef HAVE_GETOPT_LONG +#include +#else +#include "lib/getopt.h" +#endif + #ifdef HAVE_UNISTD_H #include #endif @@ -162,12 +169,6 @@ #include "lib/fnmatch.h" #endif -#ifdef HAVE_GETOPT_LONG -#include -#else -#include "lib/getopt.h" -#endif - #ifdef HAVE_GLOB #include #endif @@ -258,6 +259,12 @@ #define NO_INT64 #endif +#if HAVE_SHORT_INO_T +#define INO_T uint32 +#else +#define INO_T ino_t +#endif + #ifndef MIN #define MIN(a,b) ((a)<(b)?(a):(b)) #endif @@ -283,7 +290,7 @@ struct file_struct { time_t modtime; OFF_T length; mode_t mode; - ino_t inode; + INO_T inode; dev_t dev; dev_t rdev; uid_t uid; @@ -302,11 +309,11 @@ struct file_list { }; struct sum_buf { - OFF_T offset; /* offset in file of this chunk */ - int len; /* length of chunk of file */ - int i; /* index of this chunk */ - uint32 sum1; /* simple checksum */ - char sum2[SUM_LENGTH]; /* checksum */ + OFF_T offset; /* offset in file of this chunk */ + int len; /* length of chunk of file */ + int i; /* index of this chunk */ + uint32 sum1; /* simple checksum */ + char sum2[SUM_LENGTH]; /* checksum */ }; struct sum_struct {