If iconv_t isn't needed, define it as an "int" so that our

proto.h file can be parsed.

If iconv_t isn't needed, define it as an "int" so that our
proto.h file can be parsed.
4a1edb63 · Wayne Davison · 3170b209 · 4a1edb63
Commit 4a1edb63 authored Sep 18, 2007 by Wayne Davison
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 1 deletion

rsync.h rsync.h +7 -1

No files found.
--- 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>