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
Tweaked the O_BINARY code to the latest idiom.
[rsync/rsync.git]
/
rsync.h
diff --git
a/rsync.h
b/rsync.h
index
d144e3b
..
d897b3d
100644
(file)
--- a/
rsync.h
+++ b/
rsync.h
@@
-267,23
+267,29
@@
enum logcode {FNONE=0, FERROR=1, FINFO=2, FLOG=3 };
#if HAVE_OFF64_T
#define int64 off64_t
#if HAVE_OFF64_T
#define int64 off64_t
-#define uint64 unsigned off64_t
#elif (SIZEOF_LONG == 8)
#define int64 long
#elif (SIZEOF_LONG == 8)
#define int64 long
-#define uint64 unigned long
#elif (SIZEOF_INT == 8)
#define int64 int
#elif (SIZEOF_INT == 8)
#define int64 int
-#define uint64 unsigned int
#elif HAVE_LONGLONG
#define int64 long long
#elif HAVE_LONGLONG
#define int64 long long
-#define uint64 unsigned long long
#else
/* As long as it gets... */
#define int64 off_t
#else
/* As long as it gets... */
#define int64 off_t
-#define uint64 unsigned off_t
#define NO_INT64
#endif
#define NO_INT64
#endif
+#if (SIZEOF_LONG == 8)
+#define uint64 unsigned long
+#elif (SIZEOF_INT == 8)
+#define uint64 unsigned int
+#elif HAVE_LONGLONG
+#define uint64 unsigned long long
+#else
+/* As long as it gets... */
+#define uint64 unsigned off_t
+#endif
+
/* Starting from protocol version 26, we always use 64-bit
* ino_t and dev_t internally, even if this platform does not
* allow files to have 64-bit inums. That's because the
/* Starting from protocol version 26, we always use 64-bit
* ino_t and dev_t internally, even if this platform does not
* allow files to have 64-bit inums. That's because the
@@
-338,6
+344,10
@@
enum logcode {FNONE=0, FERROR=1, FINFO=2, FLOG=3 };
#define MAXPATHLEN 1024
#endif
#define MAXPATHLEN 1024
#endif
+#ifndef NAME_MAX
+#define NAME_MAX 255
+#endif
+
#ifndef INADDR_NONE
#define INADDR_NONE 0xffffffff
#endif
#ifndef INADDR_NONE
#define INADDR_NONE 0xffffffff
#endif
@@
-613,6
+623,10
@@
void rsyserr(enum logcode, int, const char *, ...)
#define inet_ntoa rep_inet_ntoa
#endif
#define inet_ntoa rep_inet_ntoa
#endif
+/* Make sure that the O_BINARY flag is defined. */
+#ifndef O_BINARY
+#define O_BINARY 0
+#endif
#ifndef HAVE_STRLCPY
size_t strlcpy(char *d, const char *s, size_t bufsize);
#ifndef HAVE_STRLCPY
size_t strlcpy(char *d, const char *s, size_t bufsize);