Merge branch 'mm/remote-mediawiki-build'

diff --git a/mailmap.h b/mailmap.h
index d5c3664322023d6552cb24006d833aa08224ff6f..ed7c93b05c3cc904c3052bae199346a698eec1e6 100644 (file)
--- a/mailmap.h
+++ b/mailmap.h
@@ -4,7 +4,7 @@
 int read_mailmap(struct string_list *map, char **repo_abbrev);
 void clear_mailmap(struct string_list *map);
 
-int map_user(struct string_list *mailmap,
-            char *email, int maxlen_email, char *name, int maxlen_name);
+int map_user(struct string_list *map,
+                        const char **email, size_t *emaillen, const char **name, size_t *namelen);
 
 #endif