Enable support for IPv6 on MinGW

diff --git a/merge-recursive.c b/merge-recursive.c
index 1870448d98d56fea31af56953dc33f6529d1d380..a91208f295d00d73b8fc0f5cd6a92ac422d9eeb4 100644 (file)
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -87,6 +87,7 @@ static void flush_output(struct merge_options *o)
        }
 }
 
+__attribute__((format (printf, 3, 4)))
 static void output(struct merge_options *o, int v, const char *fmt, ...)
 {
        int len;
@@ -220,7 +221,8 @@ struct tree *write_tree_from_memory(struct merge_options *o)
                for (i = 0; i < active_nr; i++) {
                        struct cache_entry *ce = active_cache[i];
                        if (ce_stage(ce))
-                               output(o, 0, "%d %.*s", ce_stage(ce), ce_namelen(ce), ce->name);
+                               output(o, 0, "%d %.*s", ce_stage(ce),
+                                      (int)ce_namelen(ce), ce->name);
                }
                return NULL;
        }