| author | Lars Hjemli <hjemli@gmail.com> | 2008-12-06 10:33:05 (UTC) |
|---|---|---|
| committer | Lars Hjemli <hjemli@gmail.com> | 2008-12-06 10:33:05 (UTC) |
| commit | 3157ea3b7e5204dba2892ffb54d641746c4c7ca4 (patch) (unidiff) | |
| tree | 93198341d83438fce50ffeda19b2510138b7b2e5 /parsing.c | |
| parent | 7b5cee65fd9cf31e4f19ce4ff613778cb95512a9 (diff) | |
| parent | d2592a2cb5ca202d9825d8f1ca6f4a712ea8fe2b (diff) | |
| download | cgit-3157ea3b7e5204dba2892ffb54d641746c4c7ca4.zip cgit-3157ea3b7e5204dba2892ffb54d641746c4c7ca4.tar.gz cgit-3157ea3b7e5204dba2892ffb54d641746c4c7ca4.tar.bz2 | |
Merge branch 'stable'
| -rw-r--r-- | parsing.c | 4 |
1 files changed, 4 insertions, 0 deletions
| @@ -98,2 +98,5 @@ char *parse_user(char *t, char **name, char **email, unsigned long *date) | |||
| 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) |
| @@ -112,2 +115,3 @@ const char *reencode(char **txt, const char *src_enc, const char *dst_enc) | |||
| 112 | } | 115 | } |
| 116 | #endif | ||
| 113 | 117 | ||