From: Wayne Davison <wayned@samba.org>
Date: Tue, 18 Sep 2007 18:45:59 +0000 (+0000)
Subject: If iconv_t isn't needed, define it as an "int" so that our
X-Git-Tag: v3.0.0pre1~59
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4a1edb63dd28c8b347d1a99551232dd8a13475e7;p=thirdparty%2Frsync.git

If iconv_t isn't needed, define it as an "int" so that our
proto.h file can be parsed.
---

diff --git a/rsync.h b/rsync.h
index 7b9dc285..c1250b68 100644
--- a/rsync.h
+++ b/rsync.h
@@ -370,9 +370,15 @@ enum msgcode {
 #ifndef ICONV_CONST
 #define ICONV_CONST
 #endif
-#elif defined ICONV_CONST
+#else
+#ifdef ICONV_CONST
 #undef ICONV_CONST
 #endif
+#ifdef iconv_t
+#undef iconv_t
+#endif
+#define iconv_t int
+#endif
 
 #include <assert.h>