X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/13710874ce907cd9405f83814cbebbe73f884e2e..983f647c7ea28f1beda1b38fe7ee885a19d2d5d5:/rsync.h

diff --git a/rsync.h b/rsync.h
index 74fd0a91..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