diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2010-06-21 06:02:45 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-06-21 06:02:45 -0700 |
| commit | 762655010d6f051f632a77b8c5b95b9f5cad02c9 (patch) | |
| tree | 8f9b2d9a72a1e1af33eaa26fd94516391f23ad62 /run-command.h | |
| parent | Merge branch 'gv/portable' (diff) | |
| parent | fast-import: die_nicely() back to vsnprintf (reverts part of ebaa79f) (diff) | |
| download | tgif-762655010d6f051f632a77b8c5b95b9f5cad02c9.tar.xz | |
Merge branch 'js/async-thread'
* js/async-thread:
fast-import: die_nicely() back to vsnprintf (reverts part of ebaa79f)
Enable threaded async procedures whenever pthreads is available
Dying in an async procedure should only exit the thread, not the process.
Reimplement async procedures using pthreads
Windows: more pthreads functions
Fix signature of fcntl() compatibility dummy
Make report() from usage.c public as vreportf() and use it.
Modernize t5530-upload-pack-error.
Conflicts:
http-backend.c
Diffstat (limited to 'run-command.h')
| -rw-r--r-- | run-command.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/run-command.h b/run-command.h index 94619f52d9..56491b9f23 100644 --- a/run-command.h +++ b/run-command.h @@ -1,6 +1,10 @@ #ifndef RUN_COMMAND_H #define RUN_COMMAND_H +#ifndef NO_PTHREADS +#include <pthread.h> +#endif + struct child_process { const char **argv; pid_t pid; @@ -74,10 +78,10 @@ struct async { void *data; int in; /* caller writes here and closes it */ int out; /* caller reads from here and closes it */ -#ifndef WIN32 +#ifdef NO_PTHREADS pid_t pid; #else - HANDLE tid; + pthread_t tid; int proc_in; int proc_out; #endif |