diff options
| author | Jeff Hostetler <jeffhost@microsoft.com> | 2021-05-20 18:28:10 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-05-21 07:55:00 +0900 |
| commit | 6aac70a870fc40482eca943ff0b64003497d69c1 (patch) | |
| tree | ccda33257024978db9833175a9d4a32b300d6db2 /compat/simple-ipc/ipc-unix-socket.c | |
| parent | 36a7eb68760b7a45ce6b16be300dd04fbe9bd029 (diff) | |
simple-ipc: correct ifdefs when NO_PTHREADS is defined
Simple IPC always requires threads (in addition to various
platform-specific IPC support). Fix the ifdefs in the Makefile
to define SUPPORTS_SIMPLE_IPC when appropriate.
Previously, the Unix version of the code would only verify that
Unix domain sockets were available.
This problem was reported here:
https://lore.kernel.org/git/YKN5lXs4AoK%2FJFTO@coredump.intra.peff.net/T/#m08be8f1942ea8a2c36cfee0e51cdf06489fdeafc
Reported-by: Randall S. Becker <rsbecker@nexbridge.com>
Helped-by: Jeff King <peff@peff.net>
Signed-off-by: Jeff Hostetler <jeffhost@microsoft.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'compat/simple-ipc/ipc-unix-socket.c')
| -rw-r--r-- | compat/simple-ipc/ipc-unix-socket.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/compat/simple-ipc/ipc-unix-socket.c b/compat/simple-ipc/ipc-unix-socket.c index 38689b278d..1927e6ef4b 100644 --- a/compat/simple-ipc/ipc-unix-socket.c +++ b/compat/simple-ipc/ipc-unix-socket.c @@ -6,8 +6,12 @@ #include "unix-socket.h" #include "unix-stream-server.h" -#ifdef NO_UNIX_SOCKETS -#error compat/simple-ipc/ipc-unix-socket.c requires Unix sockets +#ifndef SUPPORTS_SIMPLE_IPC +/* + * This source file should only be compiled when Simple IPC is supported. + * See the top-level Makefile. + */ +#error SUPPORTS_SIMPLE_IPC not defined #endif enum ipc_active_state ipc_get_active_state(const char *path) |