X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/11a5a3c704fd75325450ddae3fb2cb01f19b7111..50abd20bb3dc3d853de22cd5cf8198edfde5ae92:/rsync.h diff --git a/rsync.h b/rsync.h index dc2988a3..e11b84a0 100644 --- a/rsync.h +++ b/rsync.h @@ -23,6 +23,8 @@ #define RSYNC_NAME "rsync" #define RSYNCD_CONF "/etc/rsyncd.conf" +#define URL_PREFIX "rsync://" + #define BACKUP_SUFFIX "~" /* a non-zero CHAR_OFFSET makes the rolling sum stronger, but is @@ -61,6 +63,8 @@ #define FINFO 2 #define FLOG 3 +#include "errcode.h" + #include "config.h" #if HAVE_REMSH @@ -224,6 +228,10 @@ #define int32 long #elif (SIZEOF_SHORT == 4) #define int32 short +#else +/* I hope this works */ +#define int32 int +#define LARGE_INT32 #endif #endif @@ -357,7 +365,7 @@ static inline int flist_up(struct file_list *flist, int i) #include "byteorder.h" #include "version.h" #include "proto.h" -#include "md4.h" +#include "lib/mdfour.h" #if !HAVE_STRERROR extern char *sys_errlist[]; @@ -452,3 +460,17 @@ extern int errno; #ifndef ACCESSPERMS #define ACCESSPERMS 0777 #endif + +/* handler for null strings in printf format */ +#define NS(s) ((s)?(s):"") + +/* use magic gcc attributes to catch format errors */ + void rprintf(int , const char *, ...) +#ifdef __GNUC__ + __attribute__ ((format (printf, 2, 3))) +#endif +; + +#ifdef REPLACE_INET_NTOA +#define inet_ntoa rep_inet_ntoa +#endif