X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/702d0c45299152953e25827418a2e584c9c73731..e106de49c83ec70eb8c8bf4c92fd493757847e04:/rsync.h

diff --git a/rsync.h b/rsync.h
index f5152c35..d897b3d6 100644
--- a/rsync.h
+++ b/rsync.h
@@ -267,24 +267,29 @@ enum logcode {FNONE=0, FERROR=1, FINFO=2, FLOG=3 };
 
 #if HAVE_OFF64_T
 #define int64 off64_t
-#define int64 unsigned off64_t
-#endif
 #elif (SIZEOF_LONG == 8) 
 #define int64 long
-#define uint64 unsigned long
 #elif (SIZEOF_INT == 8) 
 #define int64 int
-#define uint64 unsigned int
 #elif HAVE_LONGLONG
 #define int64 long long
-#define uint64 unsigned long long
 #else
 /* As long as it gets... */
 #define int64 off_t
-#define uint64 unsigned off_t
 #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
@@ -339,6 +344,10 @@ enum logcode {FNONE=0, FERROR=1, FINFO=2, FLOG=3 };
 #define MAXPATHLEN 1024
 #endif
 
+#ifndef NAME_MAX
+#define NAME_MAX 255
+#endif
+
 #ifndef INADDR_NONE
 #define INADDR_NONE 0xffffffff
 #endif
@@ -614,6 +623,10 @@ void rsyserr(enum logcode, int, const char *, ...)
 #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);