Skip to content

Commit d78e513

Browse files
committed
fsmonitor-settings: stub in platform-specific incompatibility checking on MacOS
Signed-off-by: Jeff Hostetler <[email protected]>
1 parent cc72760 commit d78e513

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
@@ -148,6 +148,7 @@ ifeq ($(uname_S),Darwin)
148148
endif
149149
endif
150150
FSMONITOR_DAEMON_BACKEND = darwin
151+
FSMONITOR_OS_SETTINGS = darwin
151152
BASIC_LDFLAGS += -framework CoreServices
152153
endif
153154
ifeq ($(uname_S),SunOS)

contrib/buildsystems/CMakeLists.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -274,6 +274,9 @@ endif()
274274
if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
275275
add_compile_definitions(HAVE_FSMONITOR_OS_SETTINGS)
276276
list(APPEND compat_SOURCES compat/fsmonitor/fsm-settings-win32.c)
277+
elseif(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
278+
add_compile_definitions(HAVE_FSMONITOR_OS_SETTINGS)
279+
list(APPEND compat_SOURCES compat/fsmonitor/fsm-settings-darwin.c)
277280
endif()
278281

279282
set(EXE_EXTENSION ${CMAKE_EXECUTABLE_SUFFIX})

0 commit comments

Comments
 (0)