diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-01-05 22:48:09 -0800 | 
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-01-05 22:48:09 -0800 | 
| commit | e9326df9b1828204d6f85a6e4cb70eb0997e6f3f (patch) | |
| tree | f04d9f45641b9817f7db7480bf658932bc1a289c | |
| parent | 3e293fba627e254b2c7d196bb7563c6c9d2e6f8a (diff) | |
| parent | 0398fc349627a8a55ec4727bfb85fb7fad1f4ff0 (diff) | |
| download | git-e9326df9b1828204d6f85a6e4cb70eb0997e6f3f.tar.gz | |
Merge branch 'pf/editor-ignore-sigint'
* pf/editor-ignore-sigint:
  fix compilation with NO_PTHREADS
| -rw-r--r-- | run-command.c | 2 | 
1 files changed, 1 insertions, 1 deletions
diff --git a/run-command.c b/run-command.c index 757f263cd6..24eaad5c66 100644 --- a/run-command.c +++ b/run-command.c @@ -725,7 +725,7 @@ error:  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);  | 
