diff options
| author | Lars Hjemli | 2008-12-06 11:33:05 +0100 |
|---|---|---|
| committer | Lars Hjemli | 2008-12-06 11:33:05 +0100 |
| commit | 3157ea3b7e5204dba2892ffb54d641746c4c7ca4 (patch) | |
| tree | 93198341d83438fce50ffeda19b2510138b7b2e5 /parsing.c | |
| parent | Merge branch 'stable' (diff) | |
| parent | Merge branch 'rj/buildtweaks' into stable (diff) | |
| download | cgit-3157ea3b7e5204dba2892ffb54d641746c4c7ca4.tar.gz cgit-3157ea3b7e5204dba2892ffb54d641746c4c7ca4.zip | |
Merge branch 'stable'
Diffstat (limited to 'parsing.c')
| -rw-r--r-- | parsing.c | 4 |
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) | |||
| 96 | return p; | 96 | return p; |
| 97 | } | 97 | } |
| 98 | 98 | ||
| 99 | #ifdef NO_ICONV | ||
| 100 | #define reencode(a, b, c) | ||
| 101 | #else | ||
| 99 | const char *reencode(char **txt, const char *src_enc, const char *dst_enc) | 102 | const char *reencode(char **txt, const char *src_enc, const char *dst_enc) |
| 100 | { | 103 | { |
| 101 | char *tmp; | 104 | char *tmp; |
| @@ -110,6 +113,7 @@ const char *reencode(char **txt, const char *src_enc, const char *dst_enc) | |||
| 110 | } | 113 | } |
| 111 | return *txt; | 114 | return *txt; |
| 112 | } | 115 | } |
| 116 | #endif | ||
| 113 | 117 | ||
| 114 | struct commitinfo *cgit_parse_commit(struct commit *commit) | 118 | struct commitinfo *cgit_parse_commit(struct commit *commit) |
| 115 | { | 119 | { |