From 6f002f984f1d1ddfdae990582a423dc5263697ae Mon Sep 17 00:00:00 2001
From: David Rientjes <rientjes@google.com>
Date: Tue, 15 Aug 2006 10:40:06 -0700
Subject: use appropriate typedefs

Signed-off-by: David Rientjes <rientjes@google.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
---
 merge-index.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'merge-index.c')

diff --git a/merge-index.c b/merge-index.c
index 0498a6f45e..a9c8cc1f93 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");
-- 
cgit v1.2.1