Merge branch 'maint-2.5' into maint-2.6

diff --git a/run-command.h b/run-command.h
index 5b4425a3cbe1aea2bae40c4e060e45ee2d7a29a5..f315868a03b0969f5ad111510df1c17c0c32b702 100644 (file)
--- a/run-command.h
+++ b/run-command.h
@@ -47,9 +47,11 @@ struct child_process {
 
 #define CHILD_PROCESS_INIT { NULL, ARGV_ARRAY_INIT, ARGV_ARRAY_INIT }
 void child_process_init(struct child_process *);
+void child_process_clear(struct child_process *);
 
 int start_command(struct child_process *);
 int finish_command(struct child_process *);
+int finish_command_in_signal(struct child_process *);
 int run_command(struct child_process *);
 
 /*