Matt McCutchen's Web Site
/
rsync
/
rsync.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
If iconv_t isn't needed, define it as an "int" so that our
[rsync/rsync.git]
/
rsync.h
diff --git
a/rsync.h
b/rsync.h
index
7b9dc28
..
c1250b6
100644
(file)
--- 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>