Cleaned up headers and footers on Mir code.
authorRyan C. Gordon <icculus@icculus.org>
Sun, 02 Feb 2014 23:54:10 -0500
changeset 8154ea6b25de67b6
parent 8153 3e43c73ac79b
child 8155 cf0eda3f5e35
Cleaned up headers and footers on Mir code.
src/video/mir/SDL_mirevents.c
src/video/mir/SDL_mirevents.h
src/video/mir/SDL_mirframebuffer.c
src/video/mir/SDL_mirframebuffer.h
src/video/mir/SDL_mirmouse.c
src/video/mir/SDL_mirmouse.h
src/video/mir/SDL_miropengl.c
src/video/mir/SDL_miropengl.h
src/video/mir/SDL_mirvideo.c
src/video/mir/SDL_mirvideo.h
src/video/mir/SDL_mirwindow.c
src/video/mir/SDL_mirwindow.h
     1.1 --- a/src/video/mir/SDL_mirevents.c	Sun Feb 02 23:41:46 2014 -0500
     1.2 +++ b/src/video/mir/SDL_mirevents.c	Sun Feb 02 23:54:10 2014 -0500
     1.3 @@ -23,7 +23,9 @@
     1.4    Contributed by Brandon Schaefer, <brandon.schaefer@canonical.com>
     1.5  */
     1.6  
     1.7 -#include "SDL_config.h"
     1.8 +#include "../../SDL_internal.h"
     1.9 +
    1.10 +#if SDL_VIDEO_DRIVER_MIR
    1.11  
    1.12  #include "../../events/SDL_events_c.h"
    1.13  #include "../../events/SDL_keyboard_c.h"
    1.14 @@ -244,3 +246,7 @@
    1.15              break;
    1.16      }
    1.17  }
    1.18 +
    1.19 +#endif /* SDL_VIDEO_DRIVER_MIR */
    1.20 +
    1.21 +/* vi: set ts=4 sw=4 expandtab: */
     2.1 --- a/src/video/mir/SDL_mirevents.h	Sun Feb 02 23:41:46 2014 -0500
     2.2 +++ b/src/video/mir/SDL_mirevents.h	Sun Feb 02 23:54:10 2014 -0500
     2.3 @@ -23,8 +23,6 @@
     2.4    Contributed by Brandon Schaefer, <brandon.schaefer@canonical.com>
     2.5  */
     2.6  
     2.7 -#include "SDL_config.h"
     2.8 -
     2.9  #ifndef _SDL_mirevents_h
    2.10  #define _SDL_mirevents_h
    2.11  
    2.12 @@ -34,3 +32,6 @@
    2.13  MIR_HandleInput(MirSurface* surface, MirEvent const* ev, void* context);
    2.14  
    2.15  #endif /* _SDL_mirevents_h */
    2.16 +
    2.17 +/* vi: set ts=4 sw=4 expandtab: */
    2.18 +
     3.1 --- a/src/video/mir/SDL_mirframebuffer.c	Sun Feb 02 23:41:46 2014 -0500
     3.2 +++ b/src/video/mir/SDL_mirframebuffer.c	Sun Feb 02 23:54:10 2014 -0500
     3.3 @@ -23,7 +23,10 @@
     3.4    Contributed by Brandon Schaefer, <brandon.schaefer@canonical.com>
     3.5  */
     3.6  
     3.7 -#include "SDL_config.h"
     3.8 +#include "../../SDL_internal.h"
     3.9 +
    3.10 +#if SDL_VIDEO_DRIVER_MIR
    3.11 +
    3.12  #include "SDL_mirevents.h"
    3.13  #include "SDL_mirframebuffer.h"
    3.14  #include "SDL_mirwindow.h"
    3.15 @@ -144,3 +147,7 @@
    3.16  MIR_DestroyWindowFramebuffer(_THIS, SDL_Window* window)
    3.17  {
    3.18  }
    3.19 +
    3.20 +#endif /* SDL_VIDEO_DRIVER_MIR */
    3.21 +
    3.22 +/* vi: set ts=4 sw=4 expandtab: */
     4.1 --- a/src/video/mir/SDL_mirframebuffer.h	Sun Feb 02 23:41:46 2014 -0500
     4.2 +++ b/src/video/mir/SDL_mirframebuffer.h	Sun Feb 02 23:54:10 2014 -0500
     4.3 @@ -23,8 +23,6 @@
     4.4    Contributed by Brandon Schaefer, <brandon.schaefer@canonical.com>
     4.5  */
     4.6  
     4.7 -#include "SDL_config.h"
     4.8 -
     4.9  #ifndef _SDL_mirframebuffer_h
    4.10  #define _SDL_mirframebuffer_h
    4.11  
    4.12 @@ -44,3 +42,6 @@
    4.13  MIR_DestroyWindowFramebuffer(_THIS, SDL_Window* sdl_window);
    4.14  
    4.15  #endif /* _SDL_mirframebuffer_h */
    4.16 +
    4.17 +/* vi: set ts=4 sw=4 expandtab: */
    4.18 +
     5.1 --- a/src/video/mir/SDL_mirmouse.c	Sun Feb 02 23:41:46 2014 -0500
     5.2 +++ b/src/video/mir/SDL_mirmouse.c	Sun Feb 02 23:54:10 2014 -0500
     5.3 @@ -23,7 +23,9 @@
     5.4    Contributed by Brandon Schaefer, <brandon.schaefer@canonical.com>
     5.5  */
     5.6  
     5.7 -#include "SDL_config.h"
     5.8 +#include "../../SDL_internal.h"
     5.9 +
    5.10 +#if SDL_VIDEO_DRIVER_MIR
    5.11  
    5.12  #include "SDL_mirmouse.h"
    5.13  
    5.14 @@ -143,3 +145,8 @@
    5.15      mouse->CreateSystemCursor   = NULL;
    5.16      mouse->SetRelativeMouseMode = NULL;
    5.17  }
    5.18 +
    5.19 +#endif /* SDL_VIDEO_DRIVER_MIR */
    5.20 +
    5.21 +/* vi: set ts=4 sw=4 expandtab: */
    5.22 +
     6.1 --- a/src/video/mir/SDL_mirmouse.h	Sun Feb 02 23:41:46 2014 -0500
     6.2 +++ b/src/video/mir/SDL_mirmouse.h	Sun Feb 02 23:54:10 2014 -0500
     6.3 @@ -23,8 +23,6 @@
     6.4    Contributed by Brandon Schaefer, <brandon.schaefer@canonical.com>
     6.5  */
     6.6  
     6.7 -#include "SDL_config.h"
     6.8 -
     6.9  #ifndef _SDL_mirmouse_h
    6.10  #define _SDL_mirmouse_h
    6.11  
    6.12 @@ -35,3 +33,5 @@
    6.13  MIR_FiniMouse();
    6.14  
    6.15  #endif /* _SDL_mirmouse_h */
    6.16 +
    6.17 +/* vi: set ts=4 sw=4 expandtab: */
     7.1 --- a/src/video/mir/SDL_miropengl.c	Sun Feb 02 23:41:46 2014 -0500
     7.2 +++ b/src/video/mir/SDL_miropengl.c	Sun Feb 02 23:54:10 2014 -0500
     7.3 @@ -23,7 +23,10 @@
     7.4    Contributed by Brandon Schaefer, <brandon.schaefer@canonical.com>
     7.5  */
     7.6  
     7.7 -#include "SDL_config.h"
     7.8 +#include "../../SDL_internal.h"
     7.9 +
    7.10 +#if SDL_VIDEO_DRIVER_MIR
    7.11 +
    7.12  #include "SDL_miropengl.h"
    7.13  
    7.14  #include <dlfcn.h>
    7.15 @@ -120,3 +123,7 @@
    7.16  
    7.17      return proc_addr;
    7.18  }
    7.19 +
    7.20 +#endif /* SDL_VIDEO_DRIVER_MIR */
    7.21 +
    7.22 +/* vi: set ts=4 sw=4 expandtab: */
     8.1 --- a/src/video/mir/SDL_miropengl.h	Sun Feb 02 23:41:46 2014 -0500
     8.2 +++ b/src/video/mir/SDL_miropengl.h	Sun Feb 02 23:54:10 2014 -0500
     8.3 @@ -23,8 +23,6 @@
     8.4    Contributed by Brandon Schaefer, <brandon.schaefer@canonical.com>
     8.5  */
     8.6  
     8.7 -#include "SDL_config.h"
     8.8 -
     8.9  #ifndef _SDL_miropengl_h
    8.10  #define _SDL_miropengl_h
    8.11  
    8.12 @@ -55,3 +53,6 @@
    8.13  MIR_GL_GetProcAddress(_THIS, const char* proc);
    8.14  
    8.15  #endif /* _SDL_miropengl_h */
    8.16 +
    8.17 +/* vi: set ts=4 sw=4 expandtab: */
    8.18 +
     9.1 --- a/src/video/mir/SDL_mirvideo.c	Sun Feb 02 23:41:46 2014 -0500
     9.2 +++ b/src/video/mir/SDL_mirvideo.c	Sun Feb 02 23:54:10 2014 -0500
     9.3 @@ -23,7 +23,10 @@
     9.4    Contributed by Brandon Schaefer, <brandon.schaefer@canonical.com>
     9.5  */
     9.6  
     9.7 -#include "SDL_config.h"
     9.8 +#include "../../SDL_internal.h"
     9.9 +
    9.10 +#if SDL_VIDEO_DRIVER_MIR
    9.11 +
    9.12  #include "SDL_video.h"
    9.13  
    9.14  #include "SDL_mirframebuffer.h"
    9.15 @@ -317,3 +320,8 @@
    9.16  {
    9.17      return 0;
    9.18  }
    9.19 +
    9.20 +#endif /* SDL_VIDEO_DRIVER_MIR */
    9.21 +
    9.22 +/* vi: set ts=4 sw=4 expandtab: */
    9.23 +
    10.1 --- a/src/video/mir/SDL_mirvideo.h	Sun Feb 02 23:41:46 2014 -0500
    10.2 +++ b/src/video/mir/SDL_mirvideo.h	Sun Feb 02 23:54:10 2014 -0500
    10.3 @@ -23,8 +23,6 @@
    10.4    Contributed by Brandon Schaefer, <brandon.schaefer@canonical.com>
    10.5  */
    10.6  
    10.7 -#include "SDL_config.h"
    10.8 -
    10.9  #ifndef _SDL_mirvideo_h_
   10.10  #define _SDL_mirvideo_h_
   10.11  
   10.12 @@ -34,7 +32,8 @@
   10.13  typedef struct
   10.14  {
   10.15      MirConnection* connection;
   10.16 -
   10.17  } MIR_Data;
   10.18  
   10.19  #endif /* _SDL_mirvideo_h_ */
   10.20 +
   10.21 +/* vi: set ts=4 sw=4 expandtab: */
    11.1 --- a/src/video/mir/SDL_mirwindow.c	Sun Feb 02 23:41:46 2014 -0500
    11.2 +++ b/src/video/mir/SDL_mirwindow.c	Sun Feb 02 23:54:10 2014 -0500
    11.3 @@ -23,7 +23,9 @@
    11.4    Contributed by Brandon Schaefer, <brandon.schaefer@canonical.com>
    11.5  */
    11.6  
    11.7 -#include "SDL_config.h"
    11.8 +#include "../../SDL_internal.h"
    11.9 +
   11.10 +#if SDL_VIDEO_DRIVER_MIR
   11.11  
   11.12  #include "../SDL_egl_c.h"
   11.13  #include "../SDL_sysvideo.h"
   11.14 @@ -214,3 +216,7 @@
   11.15  
   11.16      mir_surface_set_type(mir_window->surface, mir_surface_state_restored);
   11.17  }
   11.18 +
   11.19 +#endif /* SDL_VIDEO_DRIVER_MIR */
   11.20 +
   11.21 +/* vi: set ts=4 sw=4 expandtab: */
    12.1 --- a/src/video/mir/SDL_mirwindow.h	Sun Feb 02 23:41:46 2014 -0500
    12.2 +++ b/src/video/mir/SDL_mirwindow.h	Sun Feb 02 23:54:10 2014 -0500
    12.3 @@ -23,8 +23,6 @@
    12.4    Contributed by Brandon Schaefer, <brandon.schaefer@canonical.com>
    12.5  */
    12.6  
    12.7 -#include "SDL_config.h"
    12.8 -
    12.9  #ifndef _SDL_mirwindow_h
   12.10  #define _SDL_mirwindow_h
   12.11  
   12.12 @@ -39,7 +37,6 @@
   12.13  
   12.14      MirSurface* surface;
   12.15      EGLSurface egl_surface;
   12.16 -
   12.17  } MIR_Window;
   12.18  
   12.19  
   12.20 @@ -67,3 +64,6 @@
   12.21  MIR_GetWindowWMInfo(_THIS, SDL_Window* window, SDL_SysWMinfo* info);
   12.22  
   12.23  #endif /* _SDL_mirwindow */
   12.24 +
   12.25 +/* vi: set ts=4 sw=4 expandtab: */
   12.26 +