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
Seperate the uint64_t macros from int64_t
[rsync/rsync.git]
/
rsync.h
diff --git
a/rsync.h
b/rsync.h
index
a7f1f79
..
21bd1b2
100644
(file)
--- a/
rsync.h
+++ b/
rsync.h
@@
-265,23
+265,29
@@
enum logcode {FNONE=0, FERROR=1, FINFO=2, FLOG=3 };
#define STRUCT_STAT struct stat
#endif
#define STRUCT_STAT struct stat
#endif
-#if (SIZEOF_LONG == 8)
+#if HAVE_OFF64_T
+#define int64 off64_t
+#elif (SIZEOF_LONG == 8)
#define int64 long
#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 HAVE_OFF64_T
-#define int64 off64_t
+
+#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
#endif
/* Starting from protocol version 26, we always use 64-bit