From 1171718473ea71e2c199f60c921086c44debcdb6 Mon Sep 17 00:00:00 2001 From: Brandon Schaefer Date: Mon, 21 Aug 2017 17:20:50 -0700 Subject: [PATCH] kmsdrm: Cleanup unused headers, rename SDL_kmsdrmevents_c.h -> SDL_kmsdrmevents.h --- src/video/kmsdrm/SDL_kmsdrmdyn.c | 1 + src/video/kmsdrm/SDL_kmsdrmdyn.h | 1 - src/video/kmsdrm/SDL_kmsdrmevents.c | 5 +---- src/video/kmsdrm/SDL_kmsdrmevents.h | 31 +++++++++++++++++++++++++++ src/video/kmsdrm/SDL_kmsdrmmouse.c | 6 +----- src/video/kmsdrm/SDL_kmsdrmmouse.h | 4 ++-- src/video/kmsdrm/SDL_kmsdrmopengles.c | 1 + src/video/kmsdrm/SDL_kmsdrmvideo.c | 5 +---- src/video/kmsdrm/SDL_kmsdrmvideo.h | 3 ++- 9 files changed, 40 insertions(+), 17 deletions(-) create mode 100644 src/video/kmsdrm/SDL_kmsdrmevents.h diff --git a/src/video/kmsdrm/SDL_kmsdrmdyn.c b/src/video/kmsdrm/SDL_kmsdrmdyn.c index ba4141fd642b9..9530b2a82dc43 100644 --- a/src/video/kmsdrm/SDL_kmsdrmdyn.c +++ b/src/video/kmsdrm/SDL_kmsdrmdyn.c @@ -18,6 +18,7 @@ misrepresented as being the original software. 3. This notice may not be removed or altered from any source distribution. */ + #include "../../SDL_internal.h" #if SDL_VIDEO_DRIVER_KMSDRM diff --git a/src/video/kmsdrm/SDL_kmsdrmdyn.h b/src/video/kmsdrm/SDL_kmsdrmdyn.h index 653afbccc14e8..cae942ab27daf 100644 --- a/src/video/kmsdrm/SDL_kmsdrmdyn.h +++ b/src/video/kmsdrm/SDL_kmsdrmdyn.h @@ -27,7 +27,6 @@ #include #include #include -#include #ifdef __cplusplus extern "C" { diff --git a/src/video/kmsdrm/SDL_kmsdrmevents.c b/src/video/kmsdrm/SDL_kmsdrmevents.c index 959a301832481..4e1e0ca2ec274 100644 --- a/src/video/kmsdrm/SDL_kmsdrmevents.c +++ b/src/video/kmsdrm/SDL_kmsdrmevents.c @@ -23,11 +23,8 @@ #if SDL_VIDEO_DRIVER_KMSDRM -#include "../../events/SDL_sysevents.h" -#include "../../events/SDL_events_c.h" -#include "../../events/SDL_keyboard_c.h" #include "SDL_kmsdrmvideo.h" -#include "SDL_kmsdrmevents_c.h" +#include "SDL_kmsdrmevents.h" #ifdef SDL_INPUT_LINUXEV #include "../../core/linux/SDL_evdev.h" diff --git a/src/video/kmsdrm/SDL_kmsdrmevents.h b/src/video/kmsdrm/SDL_kmsdrmevents.h new file mode 100644 index 0000000000000..8033da9c8c20c --- /dev/null +++ b/src/video/kmsdrm/SDL_kmsdrmevents.h @@ -0,0 +1,31 @@ +/* + Simple DirectMedia Layer + Copyright (C) 1997-2016 Sam Lantinga + + This software is provided 'as-is', without any express or implied + warranty. In no event will the authors be held liable for any damages + arising from the use of this software. + + Permission is granted to anyone to use this software for any purpose, + including commercial applications, and to alter it and redistribute it + freely, subject to the following restrictions: + + 1. The origin of this software must not be misrepresented; you must not + claim that you wrote the original software. If you use this software + in a product, an acknowledgment in the product documentation would be + appreciated but is not required. + 2. Altered source versions must be plainly marked as such, and must not be + misrepresented as being the original software. + 3. This notice may not be removed or altered from any source distribution. +*/ + +#include "../../SDL_internal.h" + +#ifndef _SDL_kmsdrmevents_h +#define _SDL_kmsdrmevents_h + +extern void KMSDRM_PumpEvents(_THIS); +extern void KMSDRM_EventInit(_THIS); +extern void KMSDRM_EventQuit(_THIS); + +#endif /* _SDL_kmsdrmevents_h */ diff --git a/src/video/kmsdrm/SDL_kmsdrmmouse.c b/src/video/kmsdrm/SDL_kmsdrmmouse.c index f8d6422337a8e..f44402a2bff91 100644 --- a/src/video/kmsdrm/SDL_kmsdrmmouse.c +++ b/src/video/kmsdrm/SDL_kmsdrmmouse.c @@ -18,22 +18,18 @@ misrepresented as being the original software. 3. This notice may not be removed or altered from any source distribution. */ + #include "../../SDL_internal.h" #if SDL_VIDEO_DRIVER_KMSDRM -#include "SDL_assert.h" -#include "SDL_surface.h" - #include "SDL_kmsdrmvideo.h" #include "SDL_kmsdrmmouse.h" #include "SDL_kmsdrmdyn.h" -#include "../SDL_sysvideo.h" #include "../../events/SDL_mouse_c.h" #include "../../events/default_cursor.h" - static SDL_Cursor *KMSDRM_CreateDefaultCursor(void); static SDL_Cursor *KMSDRM_CreateCursor(SDL_Surface * surface, int hot_x, int hot_y); static int KMSDRM_ShowCursor(SDL_Cursor * cursor); diff --git a/src/video/kmsdrm/SDL_kmsdrmmouse.h b/src/video/kmsdrm/SDL_kmsdrmmouse.h index 2fda1cc86fce0..b822a85e59056 100644 --- a/src/video/kmsdrm/SDL_kmsdrmmouse.h +++ b/src/video/kmsdrm/SDL_kmsdrmmouse.h @@ -19,13 +19,13 @@ 3. This notice may not be removed or altered from any source distribution. */ +#include "../../SDL_internal.h" + #ifndef _SDL_KMSDRM_mouse_h #define _SDL_KMSDRM_mouse_h #include -#include "../SDL_sysvideo.h" - typedef struct _KMSDRM_CursorData { struct gbm_bo *bo; diff --git a/src/video/kmsdrm/SDL_kmsdrmopengles.c b/src/video/kmsdrm/SDL_kmsdrmopengles.c index 4937eb56533f1..7063e5f1a5ee7 100644 --- a/src/video/kmsdrm/SDL_kmsdrmopengles.c +++ b/src/video/kmsdrm/SDL_kmsdrmopengles.c @@ -18,6 +18,7 @@ misrepresented as being the original software. 3. This notice may not be removed or altered from any source distribution. */ + #include "../../SDL_internal.h" #if SDL_VIDEO_DRIVER_KMSDRM && SDL_VIDEO_OPENGL_EGL diff --git a/src/video/kmsdrm/SDL_kmsdrmvideo.c b/src/video/kmsdrm/SDL_kmsdrmvideo.c index e7856ce44ce5f..5d77ae4e51dda 100644 --- a/src/video/kmsdrm/SDL_kmsdrmvideo.c +++ b/src/video/kmsdrm/SDL_kmsdrmvideo.c @@ -25,10 +25,7 @@ /* SDL internals */ #include "../SDL_sysvideo.h" -#include "SDL_version.h" #include "SDL_syswm.h" -#include "SDL_loadso.h" -#include "SDL_events.h" #include "SDL_log.h" #include "../../events/SDL_mouse_c.h" #include "../../events/SDL_keyboard_c.h" @@ -39,7 +36,7 @@ /* KMS/DRM declarations */ #include "SDL_kmsdrmvideo.h" -#include "SDL_kmsdrmevents_c.h" +#include "SDL_kmsdrmevents.h" #include "SDL_kmsdrmopengles.h" #include "SDL_kmsdrmmouse.h" #include "SDL_kmsdrmdyn.h" diff --git a/src/video/kmsdrm/SDL_kmsdrmvideo.h b/src/video/kmsdrm/SDL_kmsdrmvideo.h index 39eb8abab3a93..307c475dcef10 100644 --- a/src/video/kmsdrm/SDL_kmsdrmvideo.h +++ b/src/video/kmsdrm/SDL_kmsdrmvideo.h @@ -19,10 +19,11 @@ 3. This notice may not be removed or altered from any source distribution. */ +#include "../../SDL_internal.h" + #ifndef __SDL_KMSDRMVIDEO_H__ #define __SDL_KMSDRMVIDEO_H__ -#include "../../SDL_internal.h" #include "../SDL_sysvideo.h" #include