fsmonitor-settings: stub in macOS-specific incompatibility checking

Signed-off-by: Jeff Hostetler <jeffhost@microsoft.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/compat/fsmonitor/fsm-settings-darwin.c b/compat/fsmonitor/fsm-settings-darwin.c
new file mode 100644 (file)
index 0000000..7fce32a
--- /dev/null
+++ b/compat/fsmonitor/fsm-settings-darwin.c
@@ -0,0 +1,9 @@
+#include "cache.h"
+#include "config.h"
+#include "repository.h"
+#include "fsmonitor-settings.h"
+
+enum fsmonitor_reason fsm_os__incompatible(struct repository *r)
+{
+       return FSMONITOR_REASON_OK;
+}

diff --git a/config.mak.uname b/config.mak.uname
index cf224768ad65b2c84644a51cd0b4b61205ab0485..cf911d141f29f3c5242088ce907dbc215117e9af 100644 (file)
--- a/config.mak.uname
+++ b/config.mak.uname
@@ -163,6 +163,7 @@ ifeq ($(uname_S),Darwin)
        ifndef NO_PTHREADS
        ifndef NO_UNIX_SOCKETS
        FSMONITOR_DAEMON_BACKEND = darwin
+       FSMONITOR_OS_SETTINGS = darwin
        endif
        endif
 

diff --git a/contrib/buildsystems/CMakeLists.txt b/contrib/buildsystems/CMakeLists.txt
index 16705da20008e56334859c48e0322cddd29a88ec..b8f9f7a0388e9f754067c8bab55abf8ef9b47c09 100644 (file)
--- a/contrib/buildsystems/CMakeLists.txt
+++ b/contrib/buildsystems/CMakeLists.txt
@@ -295,6 +295,9 @@ if(SUPPORTS_SIMPLE_IPC)
        elseif(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
                add_compile_definitions(HAVE_FSMONITOR_DAEMON_BACKEND)
                list(APPEND compat_SOURCES compat/fsmonitor/fsm-listen-darwin.c)
+
+               add_compile_definitions(HAVE_FSMONITOR_OS_SETTINGS)
+               list(APPEND compat_SOURCES compat/fsmonitor/fsm-settings-darwin.c)
        endif()
 endif()