X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/544108829843565858514f79cf62e7b9f54f9147..14dfad3873691b5ea9fe0170d9c7f6f5c9ea3179:/rsync.h

diff --git a/rsync.h b/rsync.h
index 17b6a33a..a8463583 100644
--- a/rsync.h
+++ b/rsync.h
@@ -242,6 +242,9 @@ enum msgcode {
 #ifdef HAVE_INTTYPES_H
 # include <inttypes.h>
 #endif
+#ifdef HAVE_STDINT_H
+# include <stdint.h>
+#endif
 #ifdef HAVE_UNISTD_H
 # include <unistd.h>
 #endif
@@ -374,6 +377,9 @@ enum msgcode {
 #ifdef ICONV_CONST
 #undef ICONV_CONST
 #endif
+#ifdef ICONV_OPTION
+#undef ICONV_OPTION
+#endif
 #ifdef iconv_t
 #undef iconv_t
 #endif
@@ -846,7 +852,7 @@ typedef struct {
 #ifdef SUPPORT_XATTRS
     item_list *xattr;
 #endif
-} statx;
+} stat_x;
 
 #define ACL_READY(sx) ((sx).acc_acl != NULL)
 #define XATTR_READY(sx) ((sx).xattr != NULL)