Merge branch 'jc/c99'

diff --git a/builtin-count.c b/builtin-count.c
index 5ee72df247245cbf5fc8d5b70e8b1fddd5ab7edd..1d3729aa9914d6c68dbb6ad11cb46504b4a688e0 100644 (file)
--- a/builtin-count.c
+++ b/builtin-count.c
@@ -67,7 +67,7 @@ static void count_objects(DIR *d, char *path, int len, int verbose,
        }
 }
 
-int cmd_count_objects(int ac, const char **av, char **ep)
+int cmd_count_objects(int ac, const char **av, const char *prefix)
 {
        int i;
        int verbose = 0;