diff options
| author | Lars Hjemli <hjemli@gmail.com> | 2008-12-06 11:33:05 +0100 |
|---|---|---|
| committer | Lars Hjemli <hjemli@gmail.com> | 2008-12-06 11:33:05 +0100 |
| commit | 3157ea3b7e5204dba2892ffb54d641746c4c7ca4 (patch) | |
| tree | 93198341d83438fce50ffeda19b2510138b7b2e5 /parsing.c | |
| parent | 7b5cee65fd9cf31e4f19ce4ff613778cb95512a9 (diff) | |
| parent | d2592a2cb5ca202d9825d8f1ca6f4a712ea8fe2b (diff) | |
| download | cgit-3157ea3b7e5204dba2892ffb54d641746c4c7ca4.tar.gz cgit-3157ea3b7e5204dba2892ffb54d641746c4c7ca4.tar.bz2 cgit-3157ea3b7e5204dba2892ffb54d641746c4c7ca4.zip | |
Merge branch 'stable'
Diffstat (limited to 'parsing.c')
| -rw-r--r-- | parsing.c | 4 |
1 files changed, 4 insertions, 0 deletions
@@ -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) { |