use declarations from builtin.h for builtin commands

Signed-off-by: Matthias Kestenholz <matthias@spinlock.ch>
Signed-off-by: Junio C Hamano <junkio@cox.net>

diff --git a/builtin-fmt-merge-msg.c b/builtin-fmt-merge-msg.c
index c84224ee84803cbe4766b9e61da16da718a6eb15..485ede7cad65f7fd69e2dbaff6b32b8ad3051c54 100644 (file)
--- a/builtin-fmt-merge-msg.c
+++ b/builtin-fmt-merge-msg.c
@@ -1,3 +1,4 @@
+#include "builtin.h"

 #include "cache.h"
 #include "commit.h"
 #include "diff.h"
 #include "cache.h"
 #include "commit.h"
 #include "diff.h"


@@ -242,7 +243,7 @@ static void shortlog(const char *name, unsigned char *sha1,
        free_list(&subjects);
 }
 
        free_list(&subjects);
 }
 

-int cmd_fmt_merge_msg(int argc, char **argv, const char *prefix)
+int cmd_fmt_merge_msg(int argc, const char **argv, const char *prefix)

 {
        int limit = 20, i = 0;
        char line[1024];
 {
        int limit = 20, i = 0;
        char line[1024];

diff --git a/builtin-prune-packed.c b/builtin-prune-packed.c
index d0ff336c1479a772f9658ccc52d561469116707d..d3dd94d9ef7a50e156488ea5e9236d6d55f6e190 100644 (file)
--- a/builtin-prune-packed.c
+++ b/builtin-prune-packed.c
@@ -1,3 +1,4 @@
+#include "builtin.h"

 #include "cache.h"
 
 static const char prune_packed_usage[] =
 #include "cache.h"
 
 static const char prune_packed_usage[] =


@@ -54,7 +55,7 @@ static void prune_packed_objects(void)
        }
 }
 
        }
 }
 

-int cmd_prune_packed(int argc, char **argv, const char *prefix)
+int cmd_prune_packed(int argc, const char **argv, const char *prefix)

 {
        int i;
 
 {
        int i;