summaryrefslogtreecommitdiff
path: root/parsing.c
diff options
context:
space:
mode:
authorLars Hjemli <hjemli@gmail.com>2008-12-05 19:13:32 +0100
committerLars Hjemli <hjemli@gmail.com>2008-12-05 19:13:32 +0100
commitd2592a2cb5ca202d9825d8f1ca6f4a712ea8fe2b (patch)
tree93198341d83438fce50ffeda19b2510138b7b2e5 /parsing.c
parenta1b01b2513510f8f93f7f8ca39969002cd496a19 (diff)
parent14b4e108a73b09ce9b6df2c7f2e417305ad68cf4 (diff)
downloadcgit-d2592a2cb5ca202d9825d8f1ca6f4a712ea8fe2b.tar.gz
cgit-d2592a2cb5ca202d9825d8f1ca6f4a712ea8fe2b.tar.bz2
cgit-d2592a2cb5ca202d9825d8f1ca6f4a712ea8fe2b.zip
Merge branch 'rj/buildtweaks' into stable
Diffstat (limited to '')
-rw-r--r--parsing.c4
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
@@ -96,6 +96,9 @@ 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;
@@ -110,6 +113,7 @@ const char *reencode(char **txt, const char *src_enc, const char *dst_enc)
}
return *txt;
}
+#endif
struct commitinfo *cgit_parse_commit(struct commit *commit)
{