From 32f909f7e36a270d3b761bf15d320906ecd31eb1 Mon Sep 17 00:00:00 2001
From: Ethan Lee <[EMAIL REDACTED]>
Date: Tue, 3 Aug 2021 13:30:57 -0400
Subject: [PATCH] wayland: Remove redundant waylanddyn.h includes.
All files including waylanddyn.h already include waylandvideo.h first.
---
src/video/wayland/SDL_waylanddatamanager.c | 2 --
src/video/wayland/SDL_waylandevents.c | 2 --
src/video/wayland/SDL_waylandmouse.c | 1 -
src/video/wayland/SDL_waylandopengles.c | 1 -
src/video/wayland/SDL_waylandtouch.h | 1 -
src/video/wayland/SDL_waylandvideo.c | 1 -
src/video/wayland/SDL_waylandvideo.h | 2 +-
src/video/wayland/SDL_waylandwindow.c | 1 -
8 files changed, 1 insertion(+), 10 deletions(-)
diff --git a/src/video/wayland/SDL_waylanddatamanager.c b/src/video/wayland/SDL_waylanddatamanager.c
index c1098ab9dd..8dca7041e0 100644
--- a/src/video/wayland/SDL_waylanddatamanager.c
+++ b/src/video/wayland/SDL_waylanddatamanager.c
@@ -34,8 +34,6 @@
#include "SDL_waylandvideo.h"
#include "SDL_waylanddatamanager.h"
-#include "SDL_waylanddyn.h"
-
/* FIXME: This is arbitrary, but we want this to be less than a frame because
* any longer can potentially spin an infinite loop of PumpEvents (!)
*/
diff --git a/src/video/wayland/SDL_waylandevents.c b/src/video/wayland/SDL_waylandevents.c
index 27134fdef7..171a7a009e 100644
--- a/src/video/wayland/SDL_waylandevents.c
+++ b/src/video/wayland/SDL_waylandevents.c
@@ -35,8 +35,6 @@
#include "SDL_waylandevents_c.h"
#include "SDL_waylandwindow.h"
-#include "SDL_waylanddyn.h"
-
#include "pointer-constraints-unstable-v1-client-protocol.h"
#include "relative-pointer-unstable-v1-client-protocol.h"
#include "xdg-shell-client-protocol.h"
diff --git a/src/video/wayland/SDL_waylandmouse.c b/src/video/wayland/SDL_waylandmouse.c
index a9da55eea3..a0df26bdf0 100644
--- a/src/video/wayland/SDL_waylandmouse.c
+++ b/src/video/wayland/SDL_waylandmouse.c
@@ -36,7 +36,6 @@
#include "SDL_waylandvideo.h"
#include "SDL_waylandevents_c.h"
-#include "SDL_waylanddyn.h"
#include "wayland-cursor.h"
diff --git a/src/video/wayland/SDL_waylandopengles.c b/src/video/wayland/SDL_waylandopengles.c
index 55cd789e2c..874da8ea2e 100644
--- a/src/video/wayland/SDL_waylandopengles.c
+++ b/src/video/wayland/SDL_waylandopengles.c
@@ -30,7 +30,6 @@
#include "SDL_waylandopengles.h"
#include "SDL_waylandwindow.h"
#include "SDL_waylandevents_c.h"
-#include "SDL_waylanddyn.h"
#include "xdg-shell-client-protocol.h"
diff --git a/src/video/wayland/SDL_waylandtouch.h b/src/video/wayland/SDL_waylandtouch.h
index ebbc81dbf2..ab8b82ba9b 100644
--- a/src/video/wayland/SDL_waylandtouch.h
+++ b/src/video/wayland/SDL_waylandtouch.h
@@ -30,7 +30,6 @@
#include <stdint.h>
#include <stddef.h>
#include "wayland-util.h"
-#include "SDL_waylanddyn.h"
void Wayland_touch_create(SDL_VideoData *data, uint32_t id);
diff --git a/src/video/wayland/SDL_waylandvideo.c b/src/video/wayland/SDL_waylandvideo.c
index 2199312edf..cae17f5adc 100644
--- a/src/video/wayland/SDL_waylandvideo.c
+++ b/src/video/wayland/SDL_waylandvideo.c
@@ -43,7 +43,6 @@
#include <fcntl.h>
#include <xkbcommon/xkbcommon.h>
-#include "SDL_waylanddyn.h"
#include <wayland-util.h>
#include "xdg-shell-client-protocol.h"
diff --git a/src/video/wayland/SDL_waylandvideo.h b/src/video/wayland/SDL_waylandvideo.h
index 22cf53c004..60336b6ccf 100644
--- a/src/video/wayland/SDL_waylandvideo.h
+++ b/src/video/wayland/SDL_waylandvideo.h
@@ -92,7 +92,7 @@ typedef struct {
SDL_bool done;
} SDL_WaylandOutputData;
-/* Needed to get wl_surface declaration, fixes GitHub#4594 */
+/* Needed here to get wl_surface declaration, fixes GitHub#4594 */
#include "SDL_waylanddyn.h"
extern void SDL_WAYLAND_register_surface(struct wl_surface *surface);
diff --git a/src/video/wayland/SDL_waylandwindow.c b/src/video/wayland/SDL_waylandwindow.c
index 29823e2ec6..eb31ebbfab 100644
--- a/src/video/wayland/SDL_waylandwindow.c
+++ b/src/video/wayland/SDL_waylandwindow.c
@@ -30,7 +30,6 @@
#include "SDL_waylandwindow.h"
#include "SDL_waylandvideo.h"
#include "SDL_waylandtouch.h"
-#include "SDL_waylanddyn.h"
#include "SDL_hints.h"
#include "xdg-shell-client-protocol.h"