summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Boos <cboos@edgewall.org>2014-12-27 10:55:01 +0200
committerEli Zaretskii <eliz@gnu.org>2014-12-27 10:55:01 +0200
commit847f84e1e5c8208cfb3ab021b2e918ffae20f6d3 (patch)
tree6add7783626ec54832a2dd5eb83f58e2b5181eab
parent093c619b991da1ec466e0cffb802c4edc16c0e38 (diff)
downloadmake-847f84e1e5c8208cfb3ab021b2e918ffae20f6d3.tar.gz
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
-rw-r--r--function.c3
-rw-r--r--job.c3
2 files changed, 4 insertions, 2 deletions
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