diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-11-18 18:23:52 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-11-18 18:23:52 +0900 |
| commit | 26b80a841ad6f2ddff855aa9bd0000a4ba81f6ff (patch) | |
| tree | b2e5a385fe3e1825f11fa23de5c09cebe91c70a1 /run-command.h | |
| parent | 62ca33e02a4ea93dd59538ac986a082430253b27 (diff) | |
| parent | 2179045fd02acca83127f8d15ccd0eeb70b17400 (diff) | |
| download | git-26b80a841ad6f2ddff855aa9bd0000a4ba81f6ff.tar.xz | |
Merge branch 'nd/pthreads'
The codebase has been cleaned up to reduce "#ifndef NO_PTHREADS".
* nd/pthreads:
Clean up pthread_create() error handling
read-cache.c: initialize copy_len to shut up gcc 8
read-cache.c: reduce branching based on HAVE_THREADS
read-cache.c: remove #ifdef NO_PTHREADS
pack-objects: remove #ifdef NO_PTHREADS
preload-index.c: remove #ifdef NO_PTHREADS
grep: clean up num_threads handling
grep: remove #ifdef NO_PTHREADS
attr.c: remove #ifdef NO_PTHREADS
name-hash.c: remove #ifdef NO_PTHREADS
index-pack: remove #ifdef NO_PTHREADS
send-pack.c: move async's #ifdef NO_PTHREADS back to run-command.c
run-command.h: include thread-utils.h instead of pthread.h
thread-utils: macros to unconditionally compile pthreads API
Diffstat (limited to 'run-command.h')
| -rw-r--r-- | run-command.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/run-command.h b/run-command.h index 3932420ec8..68f5369fc2 100644 --- a/run-command.h +++ b/run-command.h @@ -1,9 +1,7 @@ #ifndef RUN_COMMAND_H #define RUN_COMMAND_H -#ifndef NO_PTHREADS -#include <pthread.h> -#endif +#include "thread-utils.h" #include "argv-array.h" @@ -143,6 +141,7 @@ struct async { int start_async(struct async *async); int finish_async(struct async *async); int in_async(void); +int async_with_fork(void); void check_pipe(int err); /** |