diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-07-15 20:41:23 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-07-15 20:41:23 +0200 |
| commit | 71a8af60aeed0ae67d119eb5e0f7d3ce1b15b2b7 (patch) | |
| tree | 9d94fd70b0b0b042b30845068cfb8df441bfdc6e | |
| parent | Merge branch 'fk/doc-format-patch-vn' into maint (diff) | |
| parent | utf8: NO_ICONV: silence uninitialized variable warning (diff) | |
| download | git-71a8af60aeed0ae67d119eb5e0f7d3ce1b15b2b7.tar.xz git-71a8af60aeed0ae67d119eb5e0f7d3ce1b15b2b7.zip | |
Merge branch 'es/utf8-stupid-compiler-workaround' into maint
A compilation workaround.
* es/utf8-stupid-compiler-workaround:
utf8: NO_ICONV: silence uninitialized variable warning
| -rw-r--r-- | utf8.h | 4 |
1 files changed, 3 insertions, 1 deletions
@@ -31,7 +31,9 @@ char *reencode_string_len(const char *in, int insz, const char *in_encoding, int *outsz); #else -#define reencode_string_len(a,b,c,d,e) NULL +static inline char *reencode_string_len(const char *a, int b, + const char *c, const char *d, int *e) +{ if (e) *e = 0; return NULL; } #endif static inline char *reencode_string(const char *in, |