summaryrefslogtreecommitdiffstats
path: root/video
diff options
context:
space:
mode:
authorDudemanguy <random342@airmail.cc>2023-06-12 14:19:29 -0500
committerDudemanguy <random342@airmail.cc>2023-06-16 14:46:59 +0000
commit45e2ca5411a88889d74cc514c1d51b4d1768864e (patch)
treef8643d7bdde523c4ea7fb61cbff48a4dd77633a0 /video
parentd16f971df5d31e64266f76f4c069ec1477892327 (diff)
downloadmpv-45e2ca5411a88889d74cc514c1d51b4d1768864e.tar.bz2
mpv-45e2ca5411a88889d74cc514c1d51b4d1768864e.tar.xz
wayland: bump required version to 1.20
This lets us remove some ifdefs.
Diffstat (limited to 'video')
-rw-r--r--video/out/wayland_common.c8
1 files changed, 0 insertions, 8 deletions
diff --git a/video/out/wayland_common.c b/video/out/wayland_common.c
index cfe641fe08..618ec39f0e 100644
--- a/video/out/wayland_common.c
+++ b/video/out/wayland_common.c
@@ -51,10 +51,6 @@
#include "generated/wayland/fractional-scale-v1.h"
#endif
-#if WAYLAND_VERSION_MAJOR > 1 || WAYLAND_VERSION_MINOR >= 20
-#define HAVE_WAYLAND_1_20
-#endif
-
#if WAYLAND_VERSION_MAJOR > 1 || WAYLAND_VERSION_MINOR >= 22
#define HAVE_WAYLAND_1_22
#endif
@@ -722,7 +718,6 @@ static void output_handle_scale(void *data, struct wl_output *wl_output,
output->scale = factor;
}
-#ifdef HAVE_WAYLAND_1_20
static void output_handle_name(void *data, struct wl_output *wl_output,
const char *name)
{
@@ -734,17 +729,14 @@ static void output_handle_description(void *data, struct wl_output *wl_output,
const char *description)
{
}
-#endif
static const struct wl_output_listener output_listener = {
output_handle_geometry,
output_handle_mode,
output_handle_done,
output_handle_scale,
-#ifdef HAVE_WAYLAND_1_20
output_handle_name,
output_handle_description,
-#endif
};
static void surface_handle_enter(void *data, struct wl_surface *wl_surface,