kmsdrm: Cleanup unused headers, rename SDL_kmsdrmevents_c.h -> SDL_kmsdrmevents.h
authorBrandon Schaefer <brandon.schaefer@canonical.com>
Mon, 21 Aug 2017 17:20:50 -0700
changeset 113420b924e560249
parent 11341 8b3231952c22
child 11343 61c9cb81ea51
kmsdrm: Cleanup unused headers, rename SDL_kmsdrmevents_c.h -> SDL_kmsdrmevents.h
src/video/kmsdrm/SDL_kmsdrmdyn.c
src/video/kmsdrm/SDL_kmsdrmdyn.h
src/video/kmsdrm/SDL_kmsdrmevents.c
src/video/kmsdrm/SDL_kmsdrmevents.h
src/video/kmsdrm/SDL_kmsdrmmouse.c
src/video/kmsdrm/SDL_kmsdrmmouse.h
src/video/kmsdrm/SDL_kmsdrmopengles.c
src/video/kmsdrm/SDL_kmsdrmvideo.c
src/video/kmsdrm/SDL_kmsdrmvideo.h
     1.1 --- a/src/video/kmsdrm/SDL_kmsdrmdyn.c	Mon Aug 21 16:30:24 2017 -0700
     1.2 +++ b/src/video/kmsdrm/SDL_kmsdrmdyn.c	Mon Aug 21 17:20:50 2017 -0700
     1.3 @@ -18,6 +18,7 @@
     1.4       misrepresented as being the original software.
     1.5    3. This notice may not be removed or altered from any source distribution.
     1.6  */
     1.7 +
     1.8  #include "../../SDL_internal.h"
     1.9  
    1.10  #if SDL_VIDEO_DRIVER_KMSDRM
     2.1 --- a/src/video/kmsdrm/SDL_kmsdrmdyn.h	Mon Aug 21 16:30:24 2017 -0700
     2.2 +++ b/src/video/kmsdrm/SDL_kmsdrmdyn.h	Mon Aug 21 17:20:50 2017 -0700
     2.3 @@ -27,7 +27,6 @@
     2.4  #include <xf86drm.h>
     2.5  #include <xf86drmMode.h>
     2.6  #include <gbm.h>
     2.7 -#include <EGL/egl.h>
     2.8  
     2.9  #ifdef __cplusplus
    2.10  extern "C" {
     3.1 --- a/src/video/kmsdrm/SDL_kmsdrmevents.c	Mon Aug 21 16:30:24 2017 -0700
     3.2 +++ b/src/video/kmsdrm/SDL_kmsdrmevents.c	Mon Aug 21 17:20:50 2017 -0700
     3.3 @@ -23,11 +23,8 @@
     3.4  
     3.5  #if SDL_VIDEO_DRIVER_KMSDRM
     3.6  
     3.7 -#include "../../events/SDL_sysevents.h"
     3.8 -#include "../../events/SDL_events_c.h"
     3.9 -#include "../../events/SDL_keyboard_c.h"
    3.10  #include "SDL_kmsdrmvideo.h"
    3.11 -#include "SDL_kmsdrmevents_c.h"
    3.12 +#include "SDL_kmsdrmevents.h"
    3.13  
    3.14  #ifdef SDL_INPUT_LINUXEV
    3.15  #include "../../core/linux/SDL_evdev.h"
     4.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     4.2 +++ b/src/video/kmsdrm/SDL_kmsdrmevents.h	Mon Aug 21 17:20:50 2017 -0700
     4.3 @@ -0,0 +1,31 @@
     4.4 +/*
     4.5 +  Simple DirectMedia Layer
     4.6 +  Copyright (C) 1997-2016 Sam Lantinga <slouken@libsdl.org>
     4.7 +
     4.8 +  This software is provided 'as-is', without any express or implied
     4.9 +  warranty.  In no event will the authors be held liable for any damages
    4.10 +  arising from the use of this software.
    4.11 +
    4.12 +  Permission is granted to anyone to use this software for any purpose,
    4.13 +  including commercial applications, and to alter it and redistribute it
    4.14 +  freely, subject to the following restrictions:
    4.15 +
    4.16 +  1. The origin of this software must not be misrepresented; you must not
    4.17 +     claim that you wrote the original software. If you use this software
    4.18 +     in a product, an acknowledgment in the product documentation would be
    4.19 +     appreciated but is not required.
    4.20 +  2. Altered source versions must be plainly marked as such, and must not be
    4.21 +     misrepresented as being the original software.
    4.22 +  3. This notice may not be removed or altered from any source distribution.
    4.23 +*/
    4.24 +
    4.25 +#include "../../SDL_internal.h"
    4.26 +
    4.27 +#ifndef _SDL_kmsdrmevents_h
    4.28 +#define _SDL_kmsdrmevents_h
    4.29 +
    4.30 +extern void KMSDRM_PumpEvents(_THIS);
    4.31 +extern void KMSDRM_EventInit(_THIS);
    4.32 +extern void KMSDRM_EventQuit(_THIS);
    4.33 +
    4.34 +#endif /* _SDL_kmsdrmevents_h */
     5.1 --- a/src/video/kmsdrm/SDL_kmsdrmmouse.c	Mon Aug 21 16:30:24 2017 -0700
     5.2 +++ b/src/video/kmsdrm/SDL_kmsdrmmouse.c	Mon Aug 21 17:20:50 2017 -0700
     5.3 @@ -18,22 +18,18 @@
     5.4       misrepresented as being the original software.
     5.5    3. This notice may not be removed or altered from any source distribution.
     5.6  */
     5.7 +
     5.8  #include "../../SDL_internal.h"
     5.9  
    5.10  #if SDL_VIDEO_DRIVER_KMSDRM
    5.11  
    5.12 -#include "SDL_assert.h"
    5.13 -#include "SDL_surface.h"
    5.14 -
    5.15  #include "SDL_kmsdrmvideo.h"
    5.16  #include "SDL_kmsdrmmouse.h"
    5.17  #include "SDL_kmsdrmdyn.h"
    5.18  
    5.19 -#include "../SDL_sysvideo.h"
    5.20  #include "../../events/SDL_mouse_c.h"
    5.21  #include "../../events/default_cursor.h"
    5.22  
    5.23 -
    5.24  static SDL_Cursor *KMSDRM_CreateDefaultCursor(void);
    5.25  static SDL_Cursor *KMSDRM_CreateCursor(SDL_Surface * surface, int hot_x, int hot_y);
    5.26  static int KMSDRM_ShowCursor(SDL_Cursor * cursor);
     6.1 --- a/src/video/kmsdrm/SDL_kmsdrmmouse.h	Mon Aug 21 16:30:24 2017 -0700
     6.2 +++ b/src/video/kmsdrm/SDL_kmsdrmmouse.h	Mon Aug 21 17:20:50 2017 -0700
     6.3 @@ -19,13 +19,13 @@
     6.4    3. This notice may not be removed or altered from any source distribution.
     6.5  */
     6.6  
     6.7 +#include "../../SDL_internal.h"
     6.8 +
     6.9  #ifndef _SDL_KMSDRM_mouse_h
    6.10  #define _SDL_KMSDRM_mouse_h
    6.11  
    6.12  #include <gbm.h>
    6.13  
    6.14 -#include "../SDL_sysvideo.h"
    6.15 -
    6.16  typedef struct _KMSDRM_CursorData
    6.17  {
    6.18      struct gbm_bo *bo;
     7.1 --- a/src/video/kmsdrm/SDL_kmsdrmopengles.c	Mon Aug 21 16:30:24 2017 -0700
     7.2 +++ b/src/video/kmsdrm/SDL_kmsdrmopengles.c	Mon Aug 21 17:20:50 2017 -0700
     7.3 @@ -18,6 +18,7 @@
     7.4       misrepresented as being the original software.
     7.5    3. This notice may not be removed or altered from any source distribution.
     7.6  */
     7.7 +
     7.8  #include "../../SDL_internal.h"
     7.9  
    7.10  #if SDL_VIDEO_DRIVER_KMSDRM && SDL_VIDEO_OPENGL_EGL
     8.1 --- a/src/video/kmsdrm/SDL_kmsdrmvideo.c	Mon Aug 21 16:30:24 2017 -0700
     8.2 +++ b/src/video/kmsdrm/SDL_kmsdrmvideo.c	Mon Aug 21 17:20:50 2017 -0700
     8.3 @@ -25,10 +25,7 @@
     8.4  
     8.5  /* SDL internals */
     8.6  #include "../SDL_sysvideo.h"
     8.7 -#include "SDL_version.h"
     8.8  #include "SDL_syswm.h"
     8.9 -#include "SDL_loadso.h"
    8.10 -#include "SDL_events.h"
    8.11  #include "SDL_log.h"
    8.12  #include "../../events/SDL_mouse_c.h"
    8.13  #include "../../events/SDL_keyboard_c.h"
    8.14 @@ -39,7 +36,7 @@
    8.15  
    8.16  /* KMS/DRM declarations */
    8.17  #include "SDL_kmsdrmvideo.h"
    8.18 -#include "SDL_kmsdrmevents_c.h"
    8.19 +#include "SDL_kmsdrmevents.h"
    8.20  #include "SDL_kmsdrmopengles.h"
    8.21  #include "SDL_kmsdrmmouse.h"
    8.22  #include "SDL_kmsdrmdyn.h"
     9.1 --- a/src/video/kmsdrm/SDL_kmsdrmvideo.h	Mon Aug 21 16:30:24 2017 -0700
     9.2 +++ b/src/video/kmsdrm/SDL_kmsdrmvideo.h	Mon Aug 21 17:20:50 2017 -0700
     9.3 @@ -19,10 +19,11 @@
     9.4    3. This notice may not be removed or altered from any source distribution.
     9.5  */
     9.6  
     9.7 +#include "../../SDL_internal.h"
     9.8 +
     9.9  #ifndef __SDL_KMSDRMVIDEO_H__
    9.10  #define __SDL_KMSDRMVIDEO_H__
    9.11  
    9.12 -#include "../../SDL_internal.h"
    9.13  #include "../SDL_sysvideo.h"
    9.14  
    9.15  #include <fcntl.h>