git-for-windows/git
1
0
Fork 0
mirror of https://github.com/git-for-windows/git.git synced 2026-03-27 18:14:53 -05:00
Code Issues Packages Projects Releases 335 Wiki Activity

fixup! fsmonitor-settings: stub in platform-specific incompatibility checking on MacOS

Browse Source 
This reverts commit 7b8c024f51.

Signed-off-by: Jeff Hostetler <jeffhost@microsoft.com>
This commit is contained in:
Jeff Hostetler
2021-09-29 15:14:11 -04:00
committed by Johannes Schindelin
parent 479df9ff68
commit 627671214f
3 changed files with 0 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,9 +0,0 @@
#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_ZERO;
}

1
config.mak.uname
View File

@@ -148,7 +148,6 @@ ifeq ($(uname_S),Darwin)
endif
endif
FSMONITOR_DAEMON_BACKEND = darwin
FSMONITOR_OS_SETTINGS = darwin
BASIC_LDFLAGS += -framework CoreServices
endif
ifeq ($(uname_S),SunOS)

3
contrib/buildsystems/CMakeLists.txt
View File

@@ -303,9 +303,6 @@ endif()
if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
add_compile_definitions(HAVE_FSMONITOR_OS_SETTINGS)
list(APPEND compat_SOURCES compat/fsmonitor/fsm-settings-win32.c)
elseif(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
add_compile_definitions(HAVE_FSMONITOR_OS_SETTINGS)
list(APPEND compat_SOURCES compat/fsmonitor/fsm-settings-darwin.c)
endif()
set(EXE_EXTENSION ${CMAKE_EXECUTABLE_SUFFIX})