From 1fae20a2b7894ab24bb2a17e48178e70c4cf0db9 Mon Sep 17 00:00:00 2001 From: Christian Boos Date: Sat, 27 Dec 2014 10:55:01 +0200 Subject: Fix $(shell) on hosts with 64-bit pid_t. * function.c: Use pid_t for shell_function_pid. * job.c: Likewise. Copyright-paperwork-exempt: yes --- function.c | 3 ++- job.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/function.c b/function.c index 169c3a1..269c8ac 100644 --- a/function.c +++ b/function.c @@ -1442,7 +1442,8 @@ fold_newlines (char *buffer, unsigned int *length, int trim_newlines) -int shell_function_pid = 0, shell_function_completed; +pid_t shell_function_pid = 0; +int shell_function_completed; #ifdef WINDOWS32 diff --git a/job.c b/job.c index 3baa5c7..3b02446 100644 --- a/job.c +++ b/job.c @@ -563,7 +563,8 @@ child_handler (int sig UNUSED) */ } -extern int shell_function_pid, shell_function_completed; +extern pid_t shell_function_pid; +extern int shell_function_completed; /* Reap all dead children, storing the returned status and the new command state ('cs_finished') in the 'file' member of the 'struct child' for the -- cgit v1.2.3