wayland: Remove redundant waylanddyn.h includes.

All files including waylanddyn.h already include waylandvideo.h first.
libsdl-org · Aug 3, 2021 · 32f909f · 32f909f
1 parent 124405a
commit 32f909f
Show file tree

Hide file tree

Showing 8 changed files with 1 addition and 10 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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"