aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEmil Velikov <emil.l.velikov@gmail.com>2021-07-12 22:37:52 +0100
committerEmil Velikov <emil.l.velikov@gmail.com>2021-07-13 15:45:48 +0100
commitc68525fff99a319686c8aa8eb5f6bfcab1a87c45 (patch)
tree00eec6ece538f01cb426adc0ceec557b0e93bcea
parent924a3b0b7e7cf8a9355cda7c3b8daaeb6759bfcf (diff)
downloadwaffle-c68525fff99a319686c8aa8eb5f6bfcab1a87c45.tar.gz
wayland: silence waffle 1.7 deprecation warnings
Keep the build clean by disabling the warnings locally. Using GCC-ism is fine here, since the code is build only with GCC or Clang both of which supporting it. Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
-rw-r--r--src/waffle/wayland/wayland_display.c3
-rw-r--r--src/waffle/wayland/wayland_window.c3
2 files changed, 6 insertions, 0 deletions
diff --git a/src/waffle/wayland/wayland_display.c b/src/waffle/wayland/wayland_display.c
index a5a4c9c..b35537c 100644
--- a/src/waffle/wayland/wayland_display.c
+++ b/src/waffle/wayland/wayland_display.c
@@ -174,7 +174,10 @@ wayland_display_fill_native(struct wayland_display *self,
{
n_dpy->wl_display = self->wl_display;
n_dpy->wl_compositor = self->wl_compositor;
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
n_dpy->wl_shell = self->wl_shell;
+#pragma GCC diagnostic pop
n_dpy->egl_display = self->wegl.egl;
n_dpy->xdg_shell = self->xdg_shell;
}
diff --git a/src/waffle/wayland/wayland_window.c b/src/waffle/wayland/wayland_window.c
index e0cf45f..f1f813a 100644
--- a/src/waffle/wayland/wayland_window.c
+++ b/src/waffle/wayland/wayland_window.c
@@ -348,7 +348,10 @@ wayland_window_get_native(struct wcore_window *wc_self)
n_window->wayland->wl_surface = self->wl_surface;
n_window->wayland->xdg_surface = self->xdg_surface;
n_window->wayland->xdg_toplevel = self->xdg_toplevel;
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
n_window->wayland->wl_shell_surface = self->wl_shell_surface;
+#pragma GCC diagnostic pop
n_window->wayland->wl_window = self->wl_window;
n_window->wayland->egl_surface = self->wegl.egl;