X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=merge-index.c;h=a9983dd78ad5cd1e364f0e00c259bdb7e6f151f0;hb=e27e609bbf81271318d99f2643f378f3fde6c6c6;hp=0498a6f45e53947e356c6a390869d3f8194f05b7;hpb=e898081dfbedcb77e3dfcdc9c347669f6c093d65;p=git.git

diff --git a/merge-index.c b/merge-index.c
index 0498a6f45..a9983dd78 100644
--- a/merge-index.c
+++ b/merge-index.c
@@ -1,17 +1,14 @@
-#include <sys/types.h>
-#include <sys/wait.h>
-#include <signal.h>
-
 #include "cache.h"
 
-static const char *pgm = NULL;
+static const char *pgm;
 static const char *arguments[8];
 static int one_shot, quiet;
 static int err;
 
 static void run_program(void)
 {
-	int pid = fork(), status;
+	pid_t pid = fork();
+	int status;
 
 	if (pid < 0)
 		die("unable to fork");