Skip to content

Commit 5cde67d

Browse files
jeffhostetlerdscho
authored andcommitted
fsmonitor-settings: stub in platform-specific incompatibility checking on MacOS
Signed-off-by: Jeff Hostetler <[email protected]>
1 parent d35af1e commit 5cde67d

File tree

3 files changed

+13
-0
lines changed

3 files changed

+13
-0
lines changed
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
#include "cache.h"
2+
#include "config.h"
3+
#include "repository.h"
4+
#include "fsmonitor-settings.h"
5+
6+
enum fsmonitor_reason fsm_os__incompatible(struct repository *r)
7+
{
8+
return FSMONITOR_REASON_ZERO;
9+
}

config.mak.uname

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -153,6 +153,7 @@ ifeq ($(uname_S),Darwin)
153153
ifndef NO_PTHREADS
154154
ifndef NO_UNIX_SOCKETS
155155
FSMONITOR_DAEMON_BACKEND = darwin
156+
FSMONITOR_OS_SETTINGS = darwin
156157
endif
157158
endif
158159

contrib/buildsystems/CMakeLists.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -320,6 +320,9 @@ if(SUPPORTS_SIMPLE_IPC)
320320
elseif(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
321321
add_compile_definitions(HAVE_FSMONITOR_DAEMON_BACKEND)
322322
list(APPEND compat_SOURCES compat/fsmonitor/fsm-listen-darwin.c)
323+
324+
add_compile_definitions(HAVE_FSMONITOR_OS_SETTINGS)
325+
list(APPEND compat_SOURCES compat/fsmonitor/fsm-settings-darwin.c)
323326
endif()
324327
endif()
325328

0 commit comments

Comments
 (0)