mirror of https://github.com/encounter/SDL.git
wayland: Remove redundant waylanddyn.h includes.
All files including waylanddyn.h already include waylandvideo.h first.
This commit is contained in:
parent
124405a0bc
commit
32f909f7e3
|
@ -34,8 +34,6 @@
|
||||||
#include "SDL_waylandvideo.h"
|
#include "SDL_waylandvideo.h"
|
||||||
#include "SDL_waylanddatamanager.h"
|
#include "SDL_waylanddatamanager.h"
|
||||||
|
|
||||||
#include "SDL_waylanddyn.h"
|
|
||||||
|
|
||||||
/* FIXME: This is arbitrary, but we want this to be less than a frame because
|
/* 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 (!)
|
* any longer can potentially spin an infinite loop of PumpEvents (!)
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -35,8 +35,6 @@
|
||||||
#include "SDL_waylandevents_c.h"
|
#include "SDL_waylandevents_c.h"
|
||||||
#include "SDL_waylandwindow.h"
|
#include "SDL_waylandwindow.h"
|
||||||
|
|
||||||
#include "SDL_waylanddyn.h"
|
|
||||||
|
|
||||||
#include "pointer-constraints-unstable-v1-client-protocol.h"
|
#include "pointer-constraints-unstable-v1-client-protocol.h"
|
||||||
#include "relative-pointer-unstable-v1-client-protocol.h"
|
#include "relative-pointer-unstable-v1-client-protocol.h"
|
||||||
#include "xdg-shell-client-protocol.h"
|
#include "xdg-shell-client-protocol.h"
|
||||||
|
|
|
@ -36,7 +36,6 @@
|
||||||
#include "SDL_waylandvideo.h"
|
#include "SDL_waylandvideo.h"
|
||||||
#include "SDL_waylandevents_c.h"
|
#include "SDL_waylandevents_c.h"
|
||||||
|
|
||||||
#include "SDL_waylanddyn.h"
|
|
||||||
#include "wayland-cursor.h"
|
#include "wayland-cursor.h"
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -30,7 +30,6 @@
|
||||||
#include "SDL_waylandopengles.h"
|
#include "SDL_waylandopengles.h"
|
||||||
#include "SDL_waylandwindow.h"
|
#include "SDL_waylandwindow.h"
|
||||||
#include "SDL_waylandevents_c.h"
|
#include "SDL_waylandevents_c.h"
|
||||||
#include "SDL_waylanddyn.h"
|
|
||||||
|
|
||||||
#include "xdg-shell-client-protocol.h"
|
#include "xdg-shell-client-protocol.h"
|
||||||
|
|
||||||
|
|
|
@ -30,7 +30,6 @@
|
||||||
#include <stdint.h>
|
#include <stdint.h>
|
||||||
#include <stddef.h>
|
#include <stddef.h>
|
||||||
#include "wayland-util.h"
|
#include "wayland-util.h"
|
||||||
#include "SDL_waylanddyn.h"
|
|
||||||
|
|
||||||
|
|
||||||
void Wayland_touch_create(SDL_VideoData *data, uint32_t id);
|
void Wayland_touch_create(SDL_VideoData *data, uint32_t id);
|
||||||
|
|
|
@ -43,7 +43,6 @@
|
||||||
#include <fcntl.h>
|
#include <fcntl.h>
|
||||||
#include <xkbcommon/xkbcommon.h>
|
#include <xkbcommon/xkbcommon.h>
|
||||||
|
|
||||||
#include "SDL_waylanddyn.h"
|
|
||||||
#include <wayland-util.h>
|
#include <wayland-util.h>
|
||||||
|
|
||||||
#include "xdg-shell-client-protocol.h"
|
#include "xdg-shell-client-protocol.h"
|
||||||
|
|
|
@ -92,7 +92,7 @@ typedef struct {
|
||||||
SDL_bool done;
|
SDL_bool done;
|
||||||
} SDL_WaylandOutputData;
|
} 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"
|
#include "SDL_waylanddyn.h"
|
||||||
|
|
||||||
extern void SDL_WAYLAND_register_surface(struct wl_surface *surface);
|
extern void SDL_WAYLAND_register_surface(struct wl_surface *surface);
|
||||||
|
|
|
@ -30,7 +30,6 @@
|
||||||
#include "SDL_waylandwindow.h"
|
#include "SDL_waylandwindow.h"
|
||||||
#include "SDL_waylandvideo.h"
|
#include "SDL_waylandvideo.h"
|
||||||
#include "SDL_waylandtouch.h"
|
#include "SDL_waylandtouch.h"
|
||||||
#include "SDL_waylanddyn.h"
|
|
||||||
#include "SDL_hints.h"
|
#include "SDL_hints.h"
|
||||||
|
|
||||||
#include "xdg-shell-client-protocol.h"
|
#include "xdg-shell-client-protocol.h"
|
||||||
|
|
Loading…
Reference in New Issue