Matt McCutchen's Web Site
/
rsync
/
rsync.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added link_dest_used unsigned short to struct hlink and made the
[rsync/rsync.git]
/
rsync.h
diff --git
a/rsync.h
b/rsync.h
index
935360e
..
de9de8e
100644
(file)
--- a/
rsync.h
+++ b/
rsync.h
@@
-64,6
+64,7
@@
#define FLAG_DEL_HERE (1<<3) /* receiver/generator */
#define FLAG_HLINK_TOL (1<<4) /* receiver/generator */
#define FLAG_NO_FUZZY (1<<5) /* generator */
#define FLAG_DEL_HERE (1<<3) /* receiver/generator */
#define FLAG_HLINK_TOL (1<<4) /* receiver/generator */
#define FLAG_NO_FUZZY (1<<5) /* generator */
+#define FLAG_MISSING (1<<6) /* generator */
/* update this if you make incompatible changes */
#define PROTOCOL_VERSION 29
/* update this if you make incompatible changes */
#define PROTOCOL_VERSION 29
@@
-313,6
+314,12
@@
enum msgcode {
#include <sys/sysmacros.h>
#endif
#include <sys/sysmacros.h>
#endif
+#ifdef MAKEDEV_TAKES_3_ARGS
+#define MAKEDEV(devmajor,devminor) makedev(0,devmajor,devminor)
+#else
+#define MAKEDEV(devmajor,devminor) makedev(devmajor,devminor)
+#endif
+
#ifdef HAVE_COMPAT_H
#include <compat.h>
#endif
#ifdef HAVE_COMPAT_H
#include <compat.h>
#endif
@@
-382,10
+389,7
@@
enum msgcode {
* to ensure that any code that really requires a 64-bit integer has
* it (e.g. the checksum code uses two 32-bit integers for its 64-bit
* counter). */
* to ensure that any code that really requires a 64-bit integer has
* it (e.g. the checksum code uses two 32-bit integers for its 64-bit
* counter). */
-#if SIZEOF_OFF64_T == 8
-# define int64 off64_t
-# define SIZEOF_INT64 8
-#elif SIZEOF_LONG == 8
+#if SIZEOF_LONG == 8
# define int64 long
# define SIZEOF_INT64 8
#elif SIZEOF_INT == 8
# define int64 long
# define SIZEOF_INT64 8
#elif SIZEOF_INT == 8
@@
-394,6
+398,9
@@
enum msgcode {
#elif SIZEOF_LONG_LONG == 8
# define int64 long long
# define SIZEOF_INT64 8
#elif SIZEOF_LONG_LONG == 8
# define int64 long long
# define SIZEOF_INT64 8
+#elif SIZEOF_OFF64_T == 8
+# define int64 off64_t
+# define SIZEOF_INT64 8
#elif SIZEOF_OFF_T == 8
# define int64 off_t
# define SIZEOF_INT64 8
#elif SIZEOF_OFF_T == 8
# define int64 off_t
# define SIZEOF_INT64 8
@@
-491,8
+498,9
@@
struct idev {
#define HL_SKIP 1
struct hlink {
#define HL_SKIP 1
struct hlink {
- int next;
- int hlindex;
+ int32 next;
+ int32 hlindex;
+ unsigned short link_dest_used;
};
#define F_DEV link_u.idev->dev
};
#define F_DEV link_u.idev->dev