Make use of new HAVE_STRUCT_STAT64 define.

diff --git a/rsync.h b/rsync.h
index 7d04bfb..87c969c 100644 (file)
--- a/rsync.h
+++ b/rsync.h
@@ -181,13 +181,6 @@ enum msgcode {
 #if HAVE_STRINGS_H
 # include <strings.h>
 #endif
-#if HAVE_INTTYPES_H
-# include <inttypes.h>
-#else
-# if HAVE_STDINT_H
-#  include <stdint.h>
-# endif
-#endif
 #if HAVE_UNISTD_H
 # include <unistd.h>
 #endif
@@ -347,7 +340,7 @@ enum msgcode {
 #define uint32 unsigned int32
 #endif
 
-#if SIZEOF_OFF64_T
+#if SIZEOF_OFF64_T && HAVE_STRUCT_STAT64
 #define OFF_T off64_t
 #define STRUCT_STAT struct stat64
 #else

diff --git a/syscall.c b/syscall.c
index d40ee64..8bfc297 100644 (file)
--- a/syscall.c
+++ b/syscall.c
@@ -212,7 +212,7 @@ int do_mkstemp(char *template, mode_t perms)
 
 int do_stat(const char *fname, STRUCT_STAT *st)
 {
-#if SIZEOF_OFF64_T
+#if SIZEOF_OFF64_T && HAVE_STRUCT_STAT64
        return stat64(fname, st);
 #else
        return stat(fname, st);
@@ -222,7 +222,7 @@ int do_stat(const char *fname, STRUCT_STAT *st)
 int do_lstat(const char *fname, STRUCT_STAT *st)
 {
 #if SUPPORT_LINKS
-# if SIZEOF_OFF64_T
+# if SIZEOF_OFF64_T && HAVE_STRUCT_STAT64
        return lstat64(fname, st);
 # else
        return lstat(fname, st);
@@ -234,7 +234,7 @@ int do_lstat(const char *fname, STRUCT_STAT *st)
 
 int do_fstat(int fd, STRUCT_STAT *st)
 {
-#if SIZEOF_OFF64_T
+#if SIZEOF_OFF64_T && HAVE_STRUCT_STAT64
        return fstat64(fd, st);
 #else
        return fstat(fd, st);
@@ -243,7 +243,7 @@ int do_fstat(int fd, STRUCT_STAT *st)
 
 OFF_T do_lseek(int fd, OFF_T offset, int whence)
 {
-#if SIZEOF_OFF64_T
+#if SIZEOF_OFF64_T && HAVE_STRUCT_STAT64
        off64_t lseek64();
        return lseek64(fd, offset, whence);
 #else