msvc: Fix macro redefinition warnings

diff --git a/builtin.h b/builtin.h
index f2a25a084736e573f560672fabc9c6214997f437..8dd4569b3c06654826c298b6b52dcf2ac17481bb 100644 (file)
--- a/builtin.h
+++ b/builtin.h
@@ -36,7 +36,7 @@ void finish_copy_notes_for_rewrite(struct notes_rewrite_cfg *c);
 
 extern int check_pager_config(const char *cmd);
 
-extern int textconv_object(const char *path, const unsigned char *sha1, char **buf, unsigned long *buf_size);
+extern int textconv_object(const char *path, unsigned mode, const unsigned char *sha1, char **buf, unsigned long *buf_size);
 
 extern int cmd_add(int argc, const char **argv, const char *prefix);
 extern int cmd_annotate(int argc, const char **argv, const char *prefix);