summaryrefslogtreecommitdiff
path: root/merge-index.c
diff options
context:
space:
mode:
authorDavid Rientjes <rientjes@google.com>2006-08-15 17:40:06 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-08-15 23:12:09 (GMT)
commit6f002f984f1d1ddfdae990582a423dc5263697ae (patch)
tree54262c1e3a316ad90ddd1ee2892789b35bfd3b1f /merge-index.c
parent0bef57ee44a2f924ad0066b751a3c87888633f56 (diff)
downloadgit-6f002f984f1d1ddfdae990582a423dc5263697ae.zip
git-6f002f984f1d1ddfdae990582a423dc5263697ae.tar.gz
git-6f002f984f1d1ddfdae990582a423dc5263697ae.tar.bz2
use appropriate typedefs
Signed-off-by: David Rientjes <rientjes@google.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
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");