Merge branch 'dl/no-extern-in-func-decl'

diff --git a/blame.h b/blame.h
index d6c4cc63f5c164ead0a4bff227c707181b1e1daf..d62f80fa74c44011f8cdaea7a4baec3d8cae03e6 100644 (file)
--- a/blame.h
+++ b/blame.h
@@ -52,7 +52,7 @@ struct blame_origin {
        struct blame_entry *suspects;
        mmfile_t file;
        struct object_id blob_oid;
-       unsigned mode;
+       unsigned short mode;
        /* guilty gets set when shipping any suspects to the final
         * blame list instead of other commits
         */