[PATCH v2] winebus.sys: Fix non-Linux builds
Gerald Pfeifer
gerald at pfeifer.com
Sun Sep 26 16:17:44 CDT 2021
commit 40a9f69a1de088fb72c6b8966bc4333dea5fdfff
winebus.sys: Rename UDEV bus device variables to be consistent.
Introducing a struct base_device, and hidraw_device / lnxev_device
depending on the sub-type of the device.
moved an existing use of ABS_VOLUME that was guarded by
#ifdef HAS_PROPER_INPUT_HEADER
outside that guard, breaking the build on non-Linux platforms.
Address this by putting appropriate guards in place.
Signed-off-by: Gerald Pfeifer <gerald at pfeifer.com>
---
dlls/winebus.sys/bus_udev.c | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c
index 88db78360e2..4f398e495fc 100644
--- a/dlls/winebus.sys/bus_udev.c
+++ b/dlls/winebus.sys/bus_udev.c
@@ -116,6 +116,9 @@ struct hidraw_device
};
#define HID_REL_MAX (REL_MISC+1)
+
+#ifdef HAS_PROPER_INPUT_HEADER
+
#define HID_ABS_MAX (ABS_VOLUME+1)
struct lnxev_device
@@ -130,6 +133,8 @@ struct lnxev_device
int haptic_effect_id;
};
+#endif
+
static inline struct base_device *impl_from_unix_device(struct unix_device *iface)
{
return CONTAINING_RECORD(iface, struct base_device, unix_device);
@@ -140,11 +145,15 @@ static inline struct hidraw_device *hidraw_impl_from_unix_device(struct unix_dev
return CONTAINING_RECORD(impl_from_unix_device(iface), struct hidraw_device, base);
}
+#ifdef HAS_PROPER_INPUT_HEADER
+
static inline struct lnxev_device *lnxev_impl_from_unix_device(struct unix_device *iface)
{
return CONTAINING_RECORD(impl_from_unix_device(iface), struct lnxev_device, base);
}
+#endif
+
#define MAX_DEVICES 128
static int close_fds[MAX_DEVICES];
static struct pollfd poll_fds[MAX_DEVICES];
--
2.31.1
More information about the wine-devel
mailing list