Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'maint'
[gitweb.git]
/
merge-index.c
diff --git
a/merge-index.c
b/merge-index.c
index 190e12fb7ceeb012a063f8c97b574e9650d95cc1..a9c8cc1f93a815a9b8226394e6f035a016fedbdb 100644
(file)
--- a/
merge-index.c
+++ b/
merge-index.c
@@
-1,5
+1,6
@@
#include <sys/types.h>
#include <sys/wait.h>
+#include <signal.h>
#include "cache.h"
@@
-10,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");