undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fsmonitor-settings: stub in macOS-specific incompatibility checking

Browse Source 
Signed-off-by: Jeff Hostetler <jeffhost@microsoft.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Jeff Hostetler 2022-05-26 21:47:01 +00:00 committed by Junio C Hamano
parent 5c58fbd265
commit a85ad67bbd
3 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
compat/fsmonitor/fsm-settings-darwin.c Normal file
View File

@ -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;
}

1
config.mak.uname
View File

@ -163,6 +163,7 @@ ifeq ($(uname_S),Darwin)
ifndef NO_PTHREADS ifndef NO_PTHREADS
ifndef NO_UNIX_SOCKETS ifndef NO_UNIX_SOCKETS
FSMONITOR_DAEMON_BACKEND = darwin FSMONITOR_DAEMON_BACKEND = darwin
FSMONITOR_OS_SETTINGS = darwin
endif endif
endif endif

3
contrib/buildsystems/CMakeLists.txt
View File

@ -295,6 +295,9 @@ if(SUPPORTS_SIMPLE_IPC)
elseif(CMAKE_SYSTEM_NAME STREQUAL "Darwin") elseif(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
add_compile_definitions(HAVE_FSMONITOR_DAEMON_BACKEND) add_compile_definitions(HAVE_FSMONITOR_DAEMON_BACKEND)
list(APPEND compat_SOURCES compat/fsmonitor/fsm-listen-darwin.c) 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()
endif() endif()