diff --git a/Makefile b/Makefile index 89567e4b66..dca63dd2d5 100644 --- a/Makefile +++ b/Makefile @@ -476,11 +476,6 @@ all:: # `compat/fsmonitor/fsm-listen-.c` that implements the # `fsm_listen__*()` routines. # -# If your platform has os-specific ways to tell if a repo is incompatible with -# fsmonitor (whether the hook or ipc daemon version), set FSMONITOR_OS_SETTINGS -# to the "" of the corresponding `compat/fsmonitor/fsm-settings-.c` -# that implements the `fsm_os_settings__*()` routines. -# # Define DEVELOPER to enable more compiler warnings. Compiler version # and family are auto detected, but could be overridden by defining # COMPILER_FEATURES (see config.mak.dev). You can still set @@ -1956,11 +1951,6 @@ ifdef FSMONITOR_DAEMON_BACKEND COMPAT_OBJS += compat/fsmonitor/fsm-listen-$(FSMONITOR_DAEMON_BACKEND).o endif -ifdef FSMONITOR_OS_SETTINGS - COMPAT_CFLAGS += -DHAVE_FSMONITOR_OS_SETTINGS - COMPAT_OBJS += compat/fsmonitor/fsm-settings-$(FSMONITOR_OS_SETTINGS).o -endif - ifeq ($(TCLTK_PATH),) NO_TCLTK = NoThanks endif @@ -2845,9 +2835,6 @@ GIT-BUILD-OPTIONS: FORCE ifdef FSMONITOR_DAEMON_BACKEND @echo FSMONITOR_DAEMON_BACKEND=\''$(subst ','\'',$(subst ','\'',$(FSMONITOR_DAEMON_BACKEND)))'\' >>$@+ endif -ifdef FSMONITOR_OS_SETTINGS - @echo FSMONITOR_OS_SETTINGS=\''$(subst ','\'',$(subst ','\'',$(FSMONITOR_OS_SETTINGS)))'\' >>$@+ -endif ifdef TEST_OUTPUT_DIRECTORY @echo TEST_OUTPUT_DIRECTORY=\''$(subst ','\'',$(subst ','\'',$(TEST_OUTPUT_DIRECTORY)))'\' >>$@+ endif diff --git a/compat/fsmonitor/fsm-settings-win32.c b/compat/fsmonitor/fsm-settings-win32.c deleted file mode 100644 index 176a6f5726..0000000000 --- a/compat/fsmonitor/fsm-settings-win32.c +++ /dev/null @@ -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; -} diff --git a/config.mak.uname b/config.mak.uname index f5935227e2..a27ccb583d 100644 --- a/config.mak.uname +++ b/config.mak.uname @@ -423,7 +423,6 @@ ifeq ($(uname_S),Windows) # # SNPRINTF_RETURNS_BOGUS = YesPlease FSMONITOR_DAEMON_BACKEND = win32 - FSMONITOR_OS_SETTINGS = win32 NO_SVN_TESTS = YesPlease RUNTIME_PREFIX = YesPlease HAVE_WPGMPTR = YesWeDo @@ -612,7 +611,6 @@ ifneq (,$(findstring MINGW,$(uname_S))) NO_MKDTEMP = YesPlease NO_SVN_TESTS = YesPlease FSMONITOR_DAEMON_BACKEND = win32 - FSMONITOR_OS_SETTINGS = win32 RUNTIME_PREFIX = YesPlease HAVE_WPGMPTR = YesWeDo NO_ST_BLOCKS_IN_STRUCT_STAT = YesPlease diff --git a/contrib/buildsystems/CMakeLists.txt b/contrib/buildsystems/CMakeLists.txt index 8bb57ead5a..79e4b0dae3 100644 --- a/contrib/buildsystems/CMakeLists.txt +++ b/contrib/buildsystems/CMakeLists.txt @@ -300,11 +300,6 @@ elseif(CMAKE_SYSTEM_NAME STREQUAL "Darwin") list(APPEND compat_SOURCES compat/fsmonitor/fsm-listen-darwin.c) endif() -if(CMAKE_SYSTEM_NAME STREQUAL "Windows") - add_compile_definitions(HAVE_FSMONITOR_OS_SETTINGS) - list(APPEND compat_SOURCES compat/fsmonitor/fsm-settings-win32.c) -endif() - set(EXE_EXTENSION ${CMAKE_EXECUTABLE_SUFFIX}) #header checks diff --git a/fsmonitor-settings.c b/fsmonitor-settings.c index 408c3f159d..5a803a41d5 100644 --- a/fsmonitor-settings.c +++ b/fsmonitor-settings.c @@ -33,18 +33,6 @@ static int check_for_incompatible(struct repository *r) return 1; } -#ifdef HAVE_FSMONITOR_OS_SETTINGS - { - enum fsmonitor_reason reason; - - reason = fsm_os__incompatible(r); - if (reason != FSMONITOR_REASON_ZERO) { - set_incompatible(r, reason); - return 1; - } - } -#endif - return 0; } diff --git a/fsmonitor-settings.h b/fsmonitor-settings.h index 813a540619..eb45524b1f 100644 --- a/fsmonitor-settings.h +++ b/fsmonitor-settings.h @@ -29,17 +29,4 @@ enum fsmonitor_reason fsm_settings__get_reason(struct repository *r, struct fsmonitor_settings; -#ifdef HAVE_FSMONITOR_OS_SETTINGS -/* - * Ask platform-specific code whether the repository is incompatible - * with fsmonitor (both hook and ipc modes). For example, if the working - * directory is on a remote volume and mounted via a technology that does - * not support notification events. - * - * fsm_os__* routines should considered private to fsm_settings__ - * routines. - */ -enum fsmonitor_reason fsm_os__incompatible(struct repository *r); -#endif /* HAVE_FSMONITOR_OS_SETTINGS */ - #endif /* FSMONITOR_SETTINGS_H */