X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/3333ffbd431e6164fe29b096ab67ff0cfda35a56..efb2f6bf626c4379065431bc207b47a4b824a7f3:/rsync.h

diff --git a/rsync.h b/rsync.h
index 13bc9dd7..34eeb575 100644
--- a/rsync.h
+++ b/rsync.h
@@ -193,10 +193,25 @@
 #define uint32 unsigned int32
 #endif
 
-#ifdef HAVE_LONGLONG
+#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
+#elif HAVE_LONGLONG
 #define int64 long long
 #else
 #define int64 off_t
+#define NO_INT64
 #endif
 
 #ifndef MIN
@@ -218,7 +233,7 @@
 struct file_struct {
 	unsigned flags;
 	time_t modtime;
-	off_t length;
+	OFF_T length;
 	mode_t mode;
 	ino_t inode;
 	dev_t dev;
@@ -239,7 +254,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 */
@@ -247,7 +262,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 */
@@ -257,7 +272,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
@@ -349,6 +364,22 @@ extern int errno;
 #define S_ISCHR(mode) (((mode) & (_S_IFMT)) == (_S_IFCHR))
 #endif
 
+#ifndef S_ISSOCK
+#ifdef _S_IFSOCK
+#define S_ISSOCK(mode) (((mode) & (_S_IFMT)) == (_S_IFSOCK))
+#else
+#define S_ISSOCK(mode) (0)
+#endif
+#endif
+
+#ifndef S_ISFIFO
+#ifdef _S_IFIFO
+#define S_ISFIFO(mode) (((mode) & (_S_IFMT)) == (_S_IFIFO))
+#else
+#define S_ISFIFO(mode) (0)
+#endif
+#endif
+
 #ifndef S_ISDIR
 #define S_ISDIR(mode) (((mode) & (_S_IFMT)) == (_S_IFDIR))
 #endif
@@ -357,5 +388,6 @@ extern int errno;
 #define S_ISREG(mode) (((mode) & (_S_IFMT)) == (_S_IFREG))
 #endif
 
-#define IS_DEVICE(mode) (S_ISCHR(mode) || S_ISBLK(mode))
+
+#define IS_DEVICE(mode) (S_ISCHR(mode) || S_ISBLK(mode) || S_ISSOCK(mode) || S_ISFIFO(mode))