Merge branch 'jk/no-system-includes-in-dot-c' into maint

diff --git a/utf8.h b/utf8.h
index 84efbfcb1fa163b5b799add81b4464ff6eb88611..fcd5167bafb38ddafc3c4e22b642b87fb935c8e1 100644 (file)
--- a/utf8.h
+++ b/utf8.h
@@ -16,7 +16,7 @@ __attribute__((format (printf, 2, 3)))
 int utf8_fprintf(FILE *, const char *, ...);
 
 extern const char utf8_bom[];
-extern int skip_utf8_bom(char **, size_t);
+int skip_utf8_bom(char **, size_t);
 
 void strbuf_add_wrapped_text(struct strbuf *buf,
                const char *text, int indent, int indent2, int width);