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
Merge modified --with-rsh patch: we now determine the default
[rsync/rsync.git]
/
rsync.h
diff --git
a/rsync.h
b/rsync.h
index
b1e76ba
..
bb45907
100644
(file)
--- a/
rsync.h
+++ b/
rsync.h
@@
-85,11
+85,9
@@
enum logcode {FNONE=0, FERROR=1, FINFO=2, FLOG=3 };
#include "config.h"
#include "config.h"
-#if HAVE_REMSH
-#define RSYNC_RSH "remsh"
-#else
-#define RSYNC_RSH "rsh"
-#endif
+/* The default RSYNC_RSH is always set in config.h, either to "remsh",
+ * "rsh", or otherwise something specified by the user. HAVE_REMSH
+ * controls parameter munging for HP/UX, etc. */
#include <sys/types.h>
#include <sys/types.h>
@@
-303,8
+301,8
@@
enum logcode {FNONE=0, FERROR=1, FINFO=2, FLOG=3 };
* cope with platforms on which this is an unsigned int or even a
* struct. Later.
*/
* cope with platforms on which this is an unsigned int or even a
* struct. Later.
*/
-#define INO64_T int64
-#define DEV64_T int64
+#define INO64_T
unsigned
int64
+#define DEV64_T
unsigned
int64
#ifndef MIN
#define MIN(a,b) ((a)<(b)?(a):(b))
#ifndef MIN
#define MIN(a,b) ((a)<(b)?(a):(b))
@@
-422,11
+420,12
@@
static inline int flist_up(struct file_list *flist, int i)
}
#include "byteorder.h"
}
#include "byteorder.h"
-#include "proto.h"
#include "lib/mdfour.h"
#include "lib/permstring.h"
#include "lib/addrinfo.h"
#include "lib/mdfour.h"
#include "lib/permstring.h"
#include "lib/addrinfo.h"
+#include "proto.h"
+
/* We have replacement versions of these if they're missing. */
#ifndef HAVE_ASPRINTF
int asprintf(char **ptr, const char *format, ...);
/* We have replacement versions of these if they're missing. */
#ifndef HAVE_ASPRINTF
int asprintf(char **ptr, const char *format, ...);