Skip to content

Commit c1b76c0

Browse files
jeffhostetlerdscho
authored andcommitted
fixup! fsm-listen-win32: stub in backend for Windows
This reverts commit 1b42506. Signed-off-by: Jeff Hostetler <[email protected]>
1 parent d953cad commit c1b76c0

File tree

6 files changed

+0
-91
lines changed

6 files changed

+0
-91
lines changed

Makefile

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -471,11 +471,6 @@ all::
471471
# directory, and the JSON compilation database 'compile_commands.json' will be
472472
# created at the root of the repository.
473473
#
474-
# If your platform supports a built-in fsmonitor backend, set
475-
# FSMONITOR_DAEMON_BACKEND to the "<name>" of the corresponding
476-
# `compat/fsmonitor/fsm-listen-<name>.c` that implements the
477-
# `fsm_listen__*()` routines.
478-
#
479474
# Define DEVELOPER to enable more compiler warnings. Compiler version
480475
# and family are auto detected, but could be overridden by defining
481476
# COMPILER_FEATURES (see config.mak.dev). You can still set
@@ -1946,11 +1941,6 @@ ifdef NEED_ACCESS_ROOT_HANDLER
19461941
COMPAT_OBJS += compat/access.o
19471942
endif
19481943

1949-
ifdef FSMONITOR_DAEMON_BACKEND
1950-
COMPAT_CFLAGS += -DHAVE_FSMONITOR_DAEMON_BACKEND
1951-
COMPAT_OBJS += compat/fsmonitor/fsm-listen-$(FSMONITOR_DAEMON_BACKEND).o
1952-
endif
1953-
19541944
ifeq ($(TCLTK_PATH),)
19551945
NO_TCLTK = NoThanks
19561946
endif
@@ -2832,9 +2822,6 @@ GIT-BUILD-OPTIONS: FORCE
28322822
@echo PAGER_ENV=\''$(subst ','\'',$(subst ','\'',$(PAGER_ENV)))'\' >>$@+
28332823
@echo DC_SHA1=\''$(subst ','\'',$(subst ','\'',$(DC_SHA1)))'\' >>$@+
28342824
@echo X=\'$(X)\' >>$@+
2835-
ifdef FSMONITOR_DAEMON_BACKEND
2836-
@echo FSMONITOR_DAEMON_BACKEND=\''$(subst ','\'',$(subst ','\'',$(FSMONITOR_DAEMON_BACKEND)))'\' >>$@+
2837-
endif
28382825
ifdef TEST_OUTPUT_DIRECTORY
28392826
@echo TEST_OUTPUT_DIRECTORY=\''$(subst ','\'',$(subst ','\'',$(TEST_OUTPUT_DIRECTORY)))'\' >>$@+
28402827
endif

compat/fsmonitor/fsm-listen-win32.c

Lines changed: 0 additions & 21 deletions
This file was deleted.

compat/fsmonitor/fsm-listen.h

Lines changed: 0 additions & 49 deletions
This file was deleted.

config.mak.uname

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -420,7 +420,6 @@ ifeq ($(uname_S),Windows)
420420
# so we don't need this:
421421
#
422422
# SNPRINTF_RETURNS_BOGUS = YesPlease
423-
FSMONITOR_DAEMON_BACKEND = win32
424423
NO_SVN_TESTS = YesPlease
425424
RUNTIME_PREFIX = YesPlease
426425
HAVE_WPGMPTR = YesWeDo
@@ -608,7 +607,6 @@ ifneq (,$(findstring MINGW,$(uname_S)))
608607
NO_STRTOUMAX = YesPlease
609608
NO_MKDTEMP = YesPlease
610609
NO_SVN_TESTS = YesPlease
611-
FSMONITOR_DAEMON_BACKEND = win32
612610
RUNTIME_PREFIX = YesPlease
613611
HAVE_WPGMPTR = YesWeDo
614612
NO_ST_BLOCKS_IN_STRUCT_STAT = YesPlease

contrib/buildsystems/CMakeLists.txt

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -292,11 +292,6 @@ else()
292292
endif()
293293
endif()
294294

295-
if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
296-
add_compile_definitions(HAVE_FSMONITOR_DAEMON_BACKEND)
297-
list(APPEND compat_SOURCES compat/fsmonitor/fsm-listen-win32.c)
298-
endif()
299-
300295
set(EXE_EXTENSION ${CMAKE_EXECUTABLE_SUFFIX})
301296

302297
#header checks

repo-settings.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
#include "config.h"
33
#include "repository.h"
44
#include "midx.h"
5-
#include "compat/fsmonitor/fsm-listen.h"
65

76
#define UPDATE_DEFAULT_BOOL(s,v) do { if (s == -1) { s = v; } } while(0)
87

0 commit comments

Comments
 (0)