Merge pull request #349 from arene-os-services-cockpit-tmc-wa/jw/comp…

…iler_fixes compiler fixes
toyota-connected · Jan 17, 2025 · 241f841 · 241f841
2 parents 003d5e2 + 918278e
commit 241f841
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 1 deletion.
diff --git a/shell/wayland/display.cc b/shell/wayland/display.cc
@@ -767,8 +767,12 @@ constexpr wl_touch_listener Display::touch_listener = {
     .motion = touch_handle_motion,
     .frame = touch_handle_frame,
     .cancel = touch_handle_cancel,
+#if defined(WL_TOUCH_SHAPE_SINCE_VERSION)
     .shape = nullptr,
+#endif
+#if defined(WL_TOUCH_ORIENTATION_SINCE_VERSION)
     .orientation = nullptr,
+#endif
 };
 
 int Display::PollEvents() const {

diff --git a/shell/wayland/window.cc b/shell/wayland/window.cc
@@ -194,6 +194,12 @@ void WaylandWindow::handle_base_surface_leave(void* /* data */,
 const struct wl_surface_listener WaylandWindow::m_base_surface_listener = {
     .enter = handle_base_surface_enter,
     .leave = handle_base_surface_leave,
+#if WL_SURFACE_PREFERRED_BUFFER_SCALE_SINCE_VERSION
+    .preferred_buffer_scale = nullptr,
+#endif
+#if WL_SURFACE_PREFERRED_BUFFER_TRANSFORM_SINCE_VERSION
+    .preferred_buffer_transform = nullptr,
+#endif
 };
 
 #if ENABLE_XDG_CLIENT

diff --git a/third_party/waypp b/third_party/waypp
+0 −2		include/waypp/window/window.h
+1 −1		src/window_manager/window_manager.cc