From 115393d8e6050cc174ef15cc7cfaca23a81a3b89 Mon Sep 17 00:00:00 2001
From: jacob <jacob@cda61777-01e9-0310-a592-d414129be87e>
Date: Tue, 1 Mar 2011 23:00:32 +0000
Subject: [PATCH] Use pid_t more consistently. Should shut up a warning from
 GCC 4.6, and may conceivably help on platforms where int and pid_t aren't
 sufficiently similar.

git-svn-id: svn://svn.tartarus.org/sgt/putty@9110 cda61777-01e9-0310-a592-d414129be87e
---
 unix/uxpty.c | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/unix/uxpty.c b/unix/uxpty.c
index 5de43a3a..16ad6e21 100644
--- a/unix/uxpty.c
+++ b/unix/uxpty.c
@@ -80,7 +80,7 @@ struct pty_tag {
     int master_fd, slave_fd;
     void *frontend;
     char name[FILENAME_MAX];
-    int child_pid;
+    pid_t child_pid;
     int term_width, term_height;
     int child_dead, finished;
     int exit_code;
@@ -137,7 +137,7 @@ static int pty_compare_by_pid(void *av, void *bv)
 
 static int pty_find_by_pid(void *av, void *bv)
 {
-    int a = *(int *)av;
+    pid_t a = *(pid_t *)av;
     Pty b = (Pty)bv;
 
     if (a < b->child_pid)
@@ -167,7 +167,8 @@ static tree234 *ptys_by_pid = NULL;
 static Pty single_pty = NULL;
 
 #ifndef OMIT_UTMP
-static int pty_utmp_helper_pid, pty_utmp_helper_pipe;
+static pid_t pty_utmp_helper_pid;
+static int pty_utmp_helper_pipe;
 static int pty_stamped_utmp;
 static struct utmpx utmp_entry;
 #endif
@@ -630,7 +631,6 @@ int pty_select_result(int fd, int event)
 
     if (fd == pty_signal_pipe[0]) {
 	pid_t pid;
-	int ipid;
 	int status;
 	char c[1];
 
@@ -641,7 +641,6 @@ int pty_select_result(int fd, int event)
 	do {
 	    pid = waitpid(-1, &status, WNOHANG);
 
-	    ipid = pid;
 	    pty = find234(ptys_by_pid, &pid, pty_find_by_pid);
 
 	    if (pty)
-- 
2.11.0