mirror of
https://github.com/git/git.git
synced 2026-03-05 06:57:37 +01:00
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>
This commit is contained in:
committed by
Junio C Hamano
parent
74d2dce10c
commit
a756c47629
@@ -306,7 +306,7 @@ if(SUPPORTS_SIMPLE_IPC)
|
||||
list(APPEND compat_SOURCES compat/fsmonitor/fsm-path-utils-${FSMONITOR_DAEMON_BACKEND}.c)
|
||||
|
||||
add_compile_definitions(HAVE_FSMONITOR_OS_SETTINGS)
|
||||
list(APPEND compat_SOURCES compat/fsmonitor/fsm-settings-${FSMONITOR_DAEMON_BACKEND}.c)
|
||||
list(APPEND compat_SOURCES compat/fsmonitor/fsm-settings-${FSMONITOR_OS_SETTINGS}.c)
|
||||
endif()
|
||||
endif()
|
||||
|
||||
|
||||
@@ -1338,7 +1338,7 @@ if fsmonitor_backend != ''
|
||||
'compat/fsmonitor/fsm-ipc-' + fsmonitor_os + '.c',
|
||||
'compat/fsmonitor/fsm-listen-' + fsmonitor_backend + '.c',
|
||||
'compat/fsmonitor/fsm-path-utils-' + fsmonitor_backend + '.c',
|
||||
'compat/fsmonitor/fsm-settings-' + fsmonitor_backend + '.c',
|
||||
'compat/fsmonitor/fsm-settings-' + fsmonitor_os + '.c',
|
||||
]
|
||||
endif
|
||||
build_options_config.set_quoted('FSMONITOR_DAEMON_BACKEND', fsmonitor_backend)
|
||||
|
||||
Reference in New Issue
Block a user