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
@@ -93,12 +93,15 @@ char *parse_user(char *t, char **name, char **email, unsigned long *date)
                 }
                 p++;
         }
         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;
 
         if (!txt || !*txt || !src_enc || !dst_enc)
                 return *txt;
@@ -107,12 +110,13 @@ const char *reencode(char **txt, const char *src_enc, const char *dst_enc)
         if (tmp) {
                 free(*txt);
                 *txt = tmp;
         }
         return *txt;
 }
+#endif
 
 struct commitinfo *cgit_parse_commit(struct commit *commit)
 {
         struct commitinfo *ret;
         char *p = commit->buffer, *t = commit->buffer;