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 /compat/mingw.h | |
| parent | 8d676d85f772ce3a100b6f0dddd1c34a7e4313cf (diff) | |
| parent | 3e333036ccbb97fddf54bd8fe74b12ba46f1687b (diff) | |
| download | git-762655010d6f051f632a77b8c5b95b9f5cad02c9.tar.gz git-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 'compat/mingw.h')
| -rw-r--r-- | compat/mingw.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compat/mingw.h b/compat/mingw.h index f465566b7..3b2477be5 100644 --- a/compat/mingw.h +++ b/compat/mingw.h @@ -89,7 +89,7 @@ static inline int getuid() { return 1; } static inline struct passwd *getpwnam(const char *name) { return NULL; } -static inline int fcntl(int fd, int cmd, long arg) +static inline int fcntl(int fd, int cmd, ...) { if (cmd == F_GETFD || cmd == F_SETFD) return 0; |