[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 6/7] sdl2: move SDL_* includes to sdl2.h
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PATCH v2 6/7] sdl2: move SDL_* includes to sdl2.h |
Date: |
Mon, 19 Jan 2015 14:36:42 +0100 |
Signed-off-by: Gerd Hoffmann <address@hidden>
---
include/ui/sdl2.h | 6 ++++++
ui/sdl2-2d.c | 6 ------
ui/sdl2-input.c | 6 ------
ui/sdl2.c | 6 ------
4 files changed, 6 insertions(+), 18 deletions(-)
diff --git a/include/ui/sdl2.h b/include/ui/sdl2.h
index f56c596..148308c 100644
--- a/include/ui/sdl2.h
+++ b/include/ui/sdl2.h
@@ -1,6 +1,12 @@
#ifndef SDL2_H
#define SDL2_H
+/* Avoid compiler warning because macro is redefined in SDL_syswm.h. */
+#undef WIN32_LEAN_AND_MEAN
+
+#include <SDL.h>
+#include <SDL_syswm.h>
+
struct sdl2_console {
DisplayChangeListener dcl;
DisplaySurface *surface;
diff --git a/ui/sdl2-2d.c b/ui/sdl2-2d.c
index 9264817..7a82d50 100644
--- a/ui/sdl2-2d.c
+++ b/ui/sdl2-2d.c
@@ -23,12 +23,6 @@
*/
/* Ported SDL 1.2 code to 2.0 by Dave Airlie. */
-/* Avoid compiler warning because macro is redefined in SDL_syswm.h. */
-#undef WIN32_LEAN_AND_MEAN
-
-#include <SDL.h>
-#include <SDL_syswm.h>
-
#include "qemu-common.h"
#include "ui/console.h"
#include "ui/input.h"
diff --git a/ui/sdl2-input.c b/ui/sdl2-input.c
index a1973fc..ac5dc94 100644
--- a/ui/sdl2-input.c
+++ b/ui/sdl2-input.c
@@ -23,12 +23,6 @@
*/
/* Ported SDL 1.2 code to 2.0 by Dave Airlie. */
-/* Avoid compiler warning because macro is redefined in SDL_syswm.h. */
-#undef WIN32_LEAN_AND_MEAN
-
-#include <SDL.h>
-#include <SDL_syswm.h>
-
#include "qemu-common.h"
#include "ui/console.h"
#include "ui/input.h"
diff --git a/ui/sdl2.c b/ui/sdl2.c
index 1ae2781..943d1da 100644
--- a/ui/sdl2.c
+++ b/ui/sdl2.c
@@ -23,12 +23,6 @@
*/
/* Ported SDL 1.2 code to 2.0 by Dave Airlie. */
-/* Avoid compiler warning because macro is redefined in SDL_syswm.h. */
-#undef WIN32_LEAN_AND_MEAN
-
-#include <SDL.h>
-#include <SDL_syswm.h>
-
#include "qemu-common.h"
#include "ui/console.h"
#include "ui/input.h"
--
1.8.3.1
- [Qemu-devel] [PATCH v2 0/7] sdl2: add opengl rendering support, Gerd Hoffmann, 2015/01/19
- [Qemu-devel] [PATCH v2 3/7] pixman: add a bunch of PIXMAN_BE_* defines for 32bpp, Gerd Hoffmann, 2015/01/19
- [Qemu-devel] [PATCH v2 1/7] configure: opengl overhaul, Gerd Hoffmann, 2015/01/19
- [Qemu-devel] [PATCH v2 7/7] sdl2: add support for display rendering using opengl., Gerd Hoffmann, 2015/01/19
- [Qemu-devel] [PATCH v2 2/7] Allow the use of X11 from a non standard location., Gerd Hoffmann, 2015/01/19
- [Qemu-devel] [PATCH v2 6/7] sdl2: move SDL_* includes to sdl2.h,
Gerd Hoffmann <=
- [Qemu-devel] [PATCH v2 5/7] console-gl: externalize shader programs, Gerd Hoffmann, 2015/01/19
- [Qemu-devel] [PATCH v2 4/7] console-gl: add opengl rendering helper functions, Gerd Hoffmann, 2015/01/19