Merge branch 'rj/buildtweaks' into stable

1 files changed, 4 insertions, 0 deletions

diff --git a/parsing.c b/parsing.c
index c8f3048..f3f3b15 100644
--- a/parsing.c
+++ b/parsing.c
@@ -95,8 +95,11 @@ char *parse_user(char *t, char **name, char **email, unsigned long *date)
 	}
 	return p;
 }
 
+#ifdef NO_ICONV
+#define reencode(a, b, c)
+#else
 const char *reencode(char **txt, const char *src_enc, const char *dst_enc)
 {
 	char *tmp;
 
@@ -109,8 +112,9 @@ const char *reencode(char **txt, const char *src_enc, const char *dst_enc)
 		*txt = tmp;
 	}
 	return *txt;
 }
+#endif
 
 struct commitinfo *cgit_parse_commit(struct commit *commit)
 {
 	struct commitinfo *ret;