some code cleanup in preparation for a cleaner client/server split

[rsync/rsync.git] / rsync.h

diff --git a/rsync.h b/rsync.h
index 6034952..1491046 100644 (file)
--- a/rsync.h
+++ b/rsync.h
@@ -179,6 +179,12 @@
 #define uchar unsigned char
 #endif
 
+#if HAVE_UNSIGNED_CHAR
+#define schar signed char
+#else
+#define schar char
+#endif
+
 #ifndef int32
 #if (SIZEOF_INT == 4)
 #define int32 int
@@ -193,7 +199,17 @@
 #define uint32 unsigned int32
 #endif
 
-#if (SIZEOF_LONG == 8) 
+#if HAVE_OFF64_T
+#define OFF_T off64_t
+#define STRUCT_STAT struct stat64
+#else
+#define OFF_T off_t
+#define STRUCT_STAT struct stat
+#endif
+
+#if HAVE_OFF64_T
+#define int64 off64_t
+#elif (SIZEOF_LONG == 8) 
 #define int64 long
 #elif (SIZEOF_INT == 8) 
 #define int64 int
@@ -223,7 +239,7 @@
 struct file_struct {
        unsigned flags;
        time_t modtime;
-       off_t length;
+       OFF_T length;
        mode_t mode;
        ino_t inode;
        dev_t dev;
@@ -244,7 +260,7 @@ struct file_list {
 };
 
 struct sum_buf {
-  off_t offset;                        /* offset in file of this chunk */
+  OFF_T offset;                        /* offset in file of this chunk */
   int len;                     /* length of chunk of file */
   int i;                       /* index of this chunk */
   uint32 sum1;                 /* simple checksum */
@@ -252,7 +268,7 @@ struct sum_buf {
 };
 
 struct sum_struct {
-  off_t flength;               /* total file length */
+  OFF_T flength;               /* total file length */
   int count;                   /* how many chunks */
   int remainder;               /* flength % block_length */
   int n;                       /* block_length */
@@ -262,7 +278,7 @@ struct sum_struct {
 struct map_struct {
        char *map,*p;
        int fd,p_size,p_len;
-       off_t size, p_offset;
+       OFF_T size, p_offset;
 };
 
 /* we need this function because of the silly way in which duplicate
@@ -274,6 +290,20 @@ static inline int flist_up(struct file_list *flist, int i)
        return i;
 }
 
+#if HAVE_DIRENT_H
+# include <dirent.h>
+#else
+# define dirent direct
+# if HAVE_SYS_NDIR_H
+#  include <sys/ndir.h>
+# endif
+# if HAVE_SYS_DIR_H
+#  include <sys/dir.h>
+# endif
+# if HAVE_NDIR_H
+#  include <ndir.h>
+# endif
+#endif
 
 #include "byteorder.h"
 #include "version.h"
@@ -290,21 +320,6 @@ extern char *sys_errlist[];
 # define strrchr                rindex
 #endif
 
-#if HAVE_DIRENT_H
-# include <dirent.h>
-#else
-# define dirent direct
-# if HAVE_SYS_NDIR_H
-#  include <sys/ndir.h>
-# endif
-# if HAVE_SYS_DIR_H
-#  include <sys/dir.h>
-# endif
-# if HAVE_NDIR_H
-#  include <ndir.h>
-# endif
-#endif
-
 #ifndef HAVE_ERRNO_DECL
 extern int errno;
 #endif