[PATCH 0/1] MR1831: winebus.sys: Fix the build without HAVE_SYS_INOTIFY_H

[Gerald Pfeifer (＠gerald)]

find_device_from_devnode was unnecessarily guarded by HAVE_SYS_INOTIFY_H,
alas its use in process_monitor_event was not, so linking failed. Simply
make find_device_from_devnode generally available.

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/1831

[PATCH 1/1] winebus.sys: Fix the build without HAVE_SYS_INOTIFY_H

[Gerald Pfeifer]

From: Gerald Pfeifer <gerald(a)pfeifer.com>

find_device_from_devnode was unnecessarily guarded by HAVE_SYS_INOTIFY_H,
alas its use in process_monitor_event was not, so linking failed. Simply
make find_device_from_devnode generally available.
---
 dlls/winebus.sys/bus_udev.c | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c
index 71b9ef84530..3cd8bfd1ceb 100644
--- a/dlls/winebus.sys/bus_udev.c
+++ b/dlls/winebus.sys/bus_udev.c
@@ -260,6 +260,16 @@ static struct base_device *find_device_from_fd(int fd)
     return NULL;
 }
 
+static struct base_device *find_device_from_devnode(const char *path)
+{
+    struct base_device *impl;
+
+    LIST_FOR_EACH_ENTRY(impl, &device_list, struct base_device, unix_device.entry)
+        if (!strcmp(impl->devnode, path)) return impl;
+
+    return NULL;
+}
+
 static void hidraw_device_destroy(struct unix_device *iface)
 {
     struct hidraw_device *impl = hidraw_impl_from_unix_device(iface);
@@ -1546,16 +1556,6 @@ static int create_inotify(void)
     return fd;
 }
 
-static struct base_device *find_device_from_devnode(const char *path)
-{
-    struct base_device *impl;
-
-    LIST_FOR_EACH_ENTRY(impl, &device_list, struct base_device, unix_device.entry)
-        if (!strcmp(impl->devnode, path)) return impl;
-
-    return NULL;
-}
-
 static void maybe_remove_devnode(const char *base, const char *dir)
 {
     struct base_device *impl;
-- 
GitLab

https://gitlab.winehq.org/wine/wine/-/merge_requests/1831

[PATCH 0/1] MR1831: winebus.sys: Fix the build without HAVE_SYS_INOTIFY_H - approved

[Rémi Bernon]

This merge request was approved by Rémi Bernon.
-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/1831