Skip to content

Commit 8a6adb8

Browse files
ptarjangitster
authored andcommitted
fsmonitor: rename fsm-settings-darwin.c to fsm-settings-unix.c
The fsmonitor settings logic in fsm-settings-darwin.c is not Darwin-specific and will be reused by the upcoming Linux implementation. Rename it to fsm-settings-unix.c to reflect that it is shared by all Unix platforms. Update the build files (meson.build and CMakeLists.txt) to use FSMONITOR_OS_SETTINGS for fsm-settings, matching the approach already used for fsm-ipc. Based-on-patch-by: Eric DeCosta <edecosta@mathworks.com> Based-on-patch-by: Marziyeh Esipreh <marziyeh.esipreh@gmail.com> Signed-off-by: Paul Tarjan <github@paulisageek.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent 30d3405 commit 8a6adb8

3 files changed

Lines changed: 2 additions & 2 deletions

File tree

contrib/buildsystems/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -306,7 +306,7 @@ if(SUPPORTS_SIMPLE_IPC)
306306
list(APPEND compat_SOURCES compat/fsmonitor/fsm-path-utils-${FSMONITOR_DAEMON_BACKEND}.c)
307307

308308
add_compile_definitions(HAVE_FSMONITOR_OS_SETTINGS)
309-
list(APPEND compat_SOURCES compat/fsmonitor/fsm-settings-${FSMONITOR_DAEMON_BACKEND}.c)
309+
list(APPEND compat_SOURCES compat/fsmonitor/fsm-settings-${FSMONITOR_OS_SETTINGS}.c)
310310
endif()
311311
endif()
312312

meson.build

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1338,7 +1338,7 @@ if fsmonitor_backend != ''
13381338
'compat/fsmonitor/fsm-ipc-' + fsmonitor_os + '.c',
13391339
'compat/fsmonitor/fsm-listen-' + fsmonitor_backend + '.c',
13401340
'compat/fsmonitor/fsm-path-utils-' + fsmonitor_backend + '.c',
1341-
'compat/fsmonitor/fsm-settings-' + fsmonitor_backend + '.c',
1341+
'compat/fsmonitor/fsm-settings-' + fsmonitor_os + '.c',
13421342
]
13431343
endif
13441344
build_options_config.set_quoted('FSMONITOR_DAEMON_BACKEND', fsmonitor_backend)

0 commit comments

Comments
 (0)