Matt McCutchen's Web Site
/
rsync
/
rsync.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
3170b20
)
If iconv_t isn't needed, define it as an "int" so that our
author
Wayne Davison
<wayned@samba.org>
Tue, 18 Sep 2007 18:45:59 +0000
(18:45 +0000)
committer
Wayne Davison
<wayned@samba.org>
Tue, 18 Sep 2007 18:45:59 +0000
(18:45 +0000)
proto.h file can be parsed.
rsync.h
patch
|
blob
|
blame
|
history
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
#ifndef ICONV_CONST
#define ICONV_CONST
#endif
-#elif defined ICONV_CONST
+#else
+#ifdef ICONV_CONST
#undef ICONV_CONST
#endif
#undef ICONV_CONST
#endif
+#ifdef iconv_t
+#undef iconv_t
+#endif
+#define iconv_t int
+#endif
#include <assert.h>
#include <assert.h>