X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/e7c67065c060d500eba8d073da9568db2c658aad..5a3810b4636f02a1276f8a39c28accdff8d664a3:/rsync.h diff --git a/rsync.h b/rsync.h index 3e5217c1..99f62e31 100644 --- 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_MISSING (1<<6) /* generator */ /* update this if you make incompatible changes */ #define PROTOCOL_VERSION 29 @@ -157,10 +158,10 @@ ITEM_BASIS_TYPE_FOLLOWS | ITEM_XNAME_FOLLOWS | ITEM_LOCAL_CHANGE)) -/* Log-message categories. Only FERROR and FINFO get sent over the socket. - * FLOG and FCLIENT are only used on the daemon side for custom logging, - * while FNAME is only used on the client side. */ -enum logcode { FERROR=1, FINFO=2, FLOG=3, FCLIENT=4, FNAME=5, FSOCKERR=6 }; +/* Log-message categories. Only FERROR and FINFO get sent over the socket, + * but FLOG and FSOCKERR can be sent over the receiver -> generator pipe. + * FLOG only goes to the log file, not the client; FCLIENT is the opposite. */ +enum logcode { FERROR=1, FINFO=2, FLOG=3, FCLIENT=4, FSOCKERR=5 }; /* Messages types that are sent over the message channel. The logcode * values must all be present here with identical numbers. */ @@ -313,6 +314,12 @@ enum msgcode { #include #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 #endif