summaryrefslogtreecommitdiff
path: root/merge-index.c
diff options
context:
space:
mode:
Diffstat (limited to 'merge-index.c')
-rw-r--r--merge-index.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/merge-index.c b/merge-index.c
index 0498a6f..a9c8cc1 100644
--- a/merge-index.c
+++ b/merge-index.c
@@ -11,7 +11,8 @@ 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");