diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-07-28 10:34:43 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-07-28 10:34:43 -0700 |
| commit | b48dfd86c90cae3f98dca01101b7e298c0192d16 (patch) | |
| tree | 4e2ab2b9811d0fc44449153e0034ae8897a80797 /compat | |
| parent | ad2d77760434e1650c186c71fa04a8fdbd77266c (diff) | |
| parent | fab60274800efba101b3f08a297639d14ecbf840 (diff) | |
| download | git-b48dfd86c90cae3f98dca01101b7e298c0192d16.tar.gz | |
Merge branch 'ew/daemon-socket-keepalive'
Recent update to "git daemon" tries to enable the socket-level
KEEPALIVE, but when it is spawned via inetd, the standard input
file descriptor may not necessarily be connected to a socket.
Suppress an ENOTSOCK error from setsockopt().
* ew/daemon-socket-keepalive:
Windows: add missing definition of ENOTSOCK
daemon: ignore ENOTSOCK from setsockopt
Diffstat (limited to 'compat')
| -rw-r--r-- | compat/mingw.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/compat/mingw.h b/compat/mingw.h index 233933ee86..95e128fcfd 100644 --- a/compat/mingw.h +++ b/compat/mingw.h @@ -73,6 +73,9 @@ typedef int pid_t; #ifndef ECONNABORTED #define ECONNABORTED WSAECONNABORTED #endif +#ifndef ENOTSOCK +#define ENOTSOCK WSAENOTSOCK +#endif struct passwd { char *pw_name; |