GIT-VERSION-FILE: check ./version first.

[thirdparty/git.git] / merge-index.c

diff --git a/merge-index.c b/merge-index.c
index 190e12fb7ceeb012a063f8c97b574e9650d95cc1..a9983dd78ad5cd1e364f0e00c259bdb7e6f151f0 100644 (file)
--- a/merge-index.c
+++ b/merge-index.c
@@ -1,16 +1,14 @@
-#include <sys/types.h>
-#include <sys/wait.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");