Cleaned up headers and footers on Mir code.

libsdl-org · Feb 3, 2014 · 8674b7a · 8674b7a
1 parent 19f8c62
commit 8674b7a
Show file tree

Hide file tree

Showing 12 changed files with 63 additions and 20 deletions.
diff --git a/src/video/mir/SDL_mirevents.c b/src/video/mir/SDL_mirevents.c
@@ -23,7 +23,9 @@
   Contributed by Brandon Schaefer, <brandon.schaefer@canonical.com>
 */
 
-#include "SDL_config.h"
+#include "../../SDL_internal.h"
+
+#if SDL_VIDEO_DRIVER_MIR
 
 #include "../../events/SDL_events_c.h"
 #include "../../events/SDL_keyboard_c.h"
@@ -244,3 +246,7 @@ MIR_HandleInput(MirSurface* surface, MirEvent const* ev, void* context)
             break;
     }
 }
+
+#endif /* SDL_VIDEO_DRIVER_MIR */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/mir/SDL_mirevents.h b/src/video/mir/SDL_mirevents.h
@@ -23,8 +23,6 @@
   Contributed by Brandon Schaefer, <brandon.schaefer@canonical.com>
 */
 
-#include "SDL_config.h"
-
 #ifndef _SDL_mirevents_h
 #define _SDL_mirevents_h
 
@@ -34,3 +32,6 @@ extern void
 MIR_HandleInput(MirSurface* surface, MirEvent const* ev, void* context);
 
 #endif /* _SDL_mirevents_h */
+
+/* vi: set ts=4 sw=4 expandtab: */
+
diff --git a/src/video/mir/SDL_mirframebuffer.c b/src/video/mir/SDL_mirframebuffer.c
@@ -23,7 +23,10 @@
   Contributed by Brandon Schaefer, <brandon.schaefer@canonical.com>
 */
 
-#include "SDL_config.h"
+#include "../../SDL_internal.h"
+
+#if SDL_VIDEO_DRIVER_MIR
+
 #include "SDL_mirevents.h"
 #include "SDL_mirframebuffer.h"
 #include "SDL_mirwindow.h"
@@ -144,3 +147,7 @@ void
 MIR_DestroyWindowFramebuffer(_THIS, SDL_Window* window)
 {
 }
+
+#endif /* SDL_VIDEO_DRIVER_MIR */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/mir/SDL_mirframebuffer.h b/src/video/mir/SDL_mirframebuffer.h
@@ -23,8 +23,6 @@
   Contributed by Brandon Schaefer, <brandon.schaefer@canonical.com>
 */
 
-#include "SDL_config.h"
-
 #ifndef _SDL_mirframebuffer_h
 #define _SDL_mirframebuffer_h
 
@@ -44,3 +42,6 @@ extern void
 MIR_DestroyWindowFramebuffer(_THIS, SDL_Window* sdl_window);
 
 #endif /* _SDL_mirframebuffer_h */
+
+/* vi: set ts=4 sw=4 expandtab: */
+
diff --git a/src/video/mir/SDL_mirmouse.c b/src/video/mir/SDL_mirmouse.c
@@ -23,7 +23,9 @@
   Contributed by Brandon Schaefer, <brandon.schaefer@canonical.com>
 */
 
-#include "SDL_config.h"
+#include "../../SDL_internal.h"
+
+#if SDL_VIDEO_DRIVER_MIR
 
 #include "SDL_mirmouse.h"
 
@@ -143,3 +145,8 @@ MIR_FiniMouse()
     mouse->CreateSystemCursor   = NULL;
     mouse->SetRelativeMouseMode = NULL;
 }
+
+#endif /* SDL_VIDEO_DRIVER_MIR */
+
+/* vi: set ts=4 sw=4 expandtab: */
+
diff --git a/src/video/mir/SDL_mirmouse.h b/src/video/mir/SDL_mirmouse.h
@@ -23,8 +23,6 @@
   Contributed by Brandon Schaefer, <brandon.schaefer@canonical.com>
 */
 
-#include "SDL_config.h"
-
 #ifndef _SDL_mirmouse_h
 #define _SDL_mirmouse_h
 
@@ -35,3 +33,5 @@ extern void
 MIR_FiniMouse();
 
 #endif /* _SDL_mirmouse_h */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/mir/SDL_miropengl.c b/src/video/mir/SDL_miropengl.c
@@ -23,7 +23,10 @@
   Contributed by Brandon Schaefer, <brandon.schaefer@canonical.com>
 */
 
-#include "SDL_config.h"
+#include "../../SDL_internal.h"
+
+#if SDL_VIDEO_DRIVER_MIR
+
 #include "SDL_miropengl.h"
 
 #include <dlfcn.h>
@@ -120,3 +123,7 @@ MIR_GL_GetProcAddress(_THIS, const char* proc)
 
     return proc_addr;
 }
+
+#endif /* SDL_VIDEO_DRIVER_MIR */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/mir/SDL_miropengl.h b/src/video/mir/SDL_miropengl.h
@@ -23,8 +23,6 @@
   Contributed by Brandon Schaefer, <brandon.schaefer@canonical.com>
 */
 
-#include "SDL_config.h"
-
 #ifndef _SDL_miropengl_h
 #define _SDL_miropengl_h
 
@@ -55,3 +53,6 @@ extern void*
 MIR_GL_GetProcAddress(_THIS, const char* proc);
 
 #endif /* _SDL_miropengl_h */
+
+/* vi: set ts=4 sw=4 expandtab: */
+
diff --git a/src/video/mir/SDL_mirvideo.c b/src/video/mir/SDL_mirvideo.c
@@ -23,7 +23,10 @@
   Contributed by Brandon Schaefer, <brandon.schaefer@canonical.com>
 */
 
-#include "SDL_config.h"
+#include "../../SDL_internal.h"
+
+#if SDL_VIDEO_DRIVER_MIR
+
 #include "SDL_video.h"
 
 #include "SDL_mirframebuffer.h"
@@ -317,3 +320,8 @@ MIR_SetDisplayMode(_THIS, SDL_VideoDisplay* sdl_display, SDL_DisplayMode* mode)
 {
     return 0;
 }
+
+#endif /* SDL_VIDEO_DRIVER_MIR */
+
+/* vi: set ts=4 sw=4 expandtab: */
+
diff --git a/src/video/mir/SDL_mirvideo.h b/src/video/mir/SDL_mirvideo.h
@@ -23,8 +23,6 @@
   Contributed by Brandon Schaefer, <brandon.schaefer@canonical.com>
 */
 
-#include "SDL_config.h"
-
 #ifndef _SDL_mirvideo_h_
 #define _SDL_mirvideo_h_
 
@@ -34,7 +32,8 @@
 typedef struct
 {
     MirConnection* connection;
-
 } MIR_Data;
 
 #endif /* _SDL_mirvideo_h_ */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/mir/SDL_mirwindow.c b/src/video/mir/SDL_mirwindow.c
@@ -23,7 +23,9 @@
   Contributed by Brandon Schaefer, <brandon.schaefer@canonical.com>
 */
 
-#include "SDL_config.h"
+#include "../../SDL_internal.h"
+
+#if SDL_VIDEO_DRIVER_MIR
 
 #include "../SDL_egl_c.h"
 #include "../SDL_sysvideo.h"
@@ -214,3 +216,7 @@ MIR_RestoreWindow(_THIS, SDL_Window * window)
 
     mir_surface_set_type(mir_window->surface, mir_surface_state_restored);
 }
+
+#endif /* SDL_VIDEO_DRIVER_MIR */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/mir/SDL_mirwindow.h b/src/video/mir/SDL_mirwindow.h
@@ -23,8 +23,6 @@
   Contributed by Brandon Schaefer, <brandon.schaefer@canonical.com>
 */
 
-#include "SDL_config.h"
-
 #ifndef _SDL_mirwindow_h
 #define _SDL_mirwindow_h
 
@@ -39,7 +37,6 @@ typedef struct {
 
     MirSurface* surface;
     EGLSurface egl_surface;
-
 } MIR_Window;
 
 
@@ -67,3 +64,6 @@ extern SDL_bool
 MIR_GetWindowWMInfo(_THIS, SDL_Window* window, SDL_SysWMinfo* info);
 
 #endif /* _SDL_mirwindow */
+
+/* vi: set ts=4 sw=4 expandtab: */
+