Commit 8674b7aeee7459d7f30f85f18310ff1dd22efea6
2014-02-02T23:54:10
Cleaned up headers and footers on Mir code.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273
diff --git a/src/video/mir/SDL_mirevents.c b/src/video/mir/SDL_mirevents.c
index 4ac377a..48e0979 100644
--- 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
index 1be183a..b800013 100644
--- 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
index b0b77df..e662048 100644
--- 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
index 704e4aa..72cacda 100644
--- 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
index 010e292..387f868 100644
--- 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
index 0832f0f..df73246 100644
--- 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
index fcd6568..df18019 100644
--- 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
index dda1d00..21311f2 100644
--- 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
index 174d9af..f4c3e3f 100644
--- 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
index baa0ef0..1d1e337 100644
--- 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
index 53f3d8f..f0d8a2a 100644
--- 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
index 9377fa0..caa7c22 100644
--- 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: */
+