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 169c3a17e8802f1c47bfb391293e9a2e5bfc67d1..269c8ac8098827bb24410edfeb10573956e5d105 100644 (file)
--- 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 3baa5c7820d63f77de39d44a3d63f18421023552..3b02446e939f12c12c9abe7d3102dcc027f7a680 100644 (file)
--- 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