Sync with 2.6.1

diff --git a/run-command.h b/run-command.h
index 5b4425a3cbe1aea2bae40c4e060e45ee2d7a29a5..629fab7ae0b2af5c0ada5977a11f862de4cdd273 100644 (file)
--- a/run-command.h
+++ b/run-command.h
@@ -118,5 +118,6 @@ struct async {
 
 int start_async(struct async *async);
 int finish_async(struct async *async);
+int in_async(void);
 
 #endif