Merge branch 'pf/editor-ignore-sigint'
authorJunio C Hamano <gitster@pobox.com>
Sun, 6 Jan 2013 06:48:09 +0000 (22:48 -0800)
committerJunio C Hamano <gitster@pobox.com>
Sun, 6 Jan 2013 06:48:09 +0000 (22:48 -0800)
* pf/editor-ignore-sigint:
fix compilation with NO_PTHREADS

run-command.c
index 757f263cd6209cf5aa2b2bbda28e1103ad0303f8..24eaad5c66c1742602347c42c71d279297aabc2a 100644 (file)
@@ -725,7 +725,7 @@ int start_async(struct async *async)
 int finish_async(struct async *async)
 {
 #ifdef NO_PTHREADS
-       return wait_or_whine(async->pid, "child process", 0);
+       return wait_or_whine(async->pid, "child process");
 #else
        void *ret = (void *)(intptr_t)(-1);