Merge branch 'jn/less-reconfigure' into maint

diff --git a/utf8.h b/utf8.h
index f50c567d4202142325ce7a7f991b42775ff0fca5..501b2bd9c4fd3fdce6dcbba1a3e3f7c0211d6c8f 100644 (file)
--- a/utf8.h
+++ b/utf8.h
@@ -7,6 +7,8 @@ int utf8_width(const char **start, size_t *remainder_p);
 int utf8_strwidth(const char *string);
 int is_utf8(const char *text);
 int is_encoding_utf8(const char *name);
+int same_encoding(const char *, const char *);
+int utf8_fprintf(FILE *, const char *, ...);
 
 void strbuf_add_wrapped_text(struct strbuf *buf,
                const char *text, int indent, int indent2, int width);
@@ -14,6 +16,7 @@ void strbuf_add_wrapped_bytes(struct strbuf *buf, const char *data, int len,
                             int indent, int indent2, int width);
 
 #ifndef NO_ICONV
+char *reencode_string_iconv(const char *in, size_t insz, iconv_t conv);
 char *reencode_string(const char *in, const char *out_encoding, const char *in_encoding);
 #else
 #define reencode_string(a,b,c) NULL