From: Christian Boos <cboos@edgewall.org>
Date: Sat, 27 Dec 2014 08:55:01 +0000 (+0200)
Subject: Fix $(shell) on hosts with 64-bit pid_t.
X-Git-Tag: 4.1.90~57
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1fae20a2b7894ab24bb2a17e48178e70c4cf0db9;p=thirdparty%2Fmake.git

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
---

diff --git a/function.c b/function.c
index 169c3a17..269c8ac8 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 3baa5c78..3b02446e 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