qemu: fix nativesdk build without x11
when x11 is not defined in DISTRO_FEATURES, there are no x11 headers so True is not defined leading to : | ui/sdl.c:62:8: warning: type defaults to 'int' in declaration of 'doing_grabs' [-Wimplicit-int] | static doing_grabs = True; | ^ | ui/sdl.c:62:22: error: 'True' undeclared here (not in a function) | static doing_grabs = True; | ^ (From OE-Core rev: d3d5ccd3275196fb9e4cb8f49d3c087b97c20ed6) Signed-off-by: Eric Bénard <eric@eukrea.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
abeea1be5f
commit
0b9c3393c1
|
@ -13,30 +13,33 @@ the current grabbing behaviour for everyone else.
|
||||||
Upstream-Status: Pending
|
Upstream-Status: Pending
|
||||||
Signed-off-by: Ross Burton <ross.burton@intel.com>
|
Signed-off-by: Ross Burton <ross.burton@intel.com>
|
||||||
|
|
||||||
|
|
||||||
From 4b1988ecb01a178269ec0513a75f2ec620c7ef6a Mon Sep 17 00:00:00 2001
|
From 4b1988ecb01a178269ec0513a75f2ec620c7ef6a Mon Sep 17 00:00:00 2001
|
||||||
From: Ross Burton <ross.burton@intel.com>
|
From: Ross Burton <ross.burton@intel.com>
|
||||||
Date: Wed, 18 Sep 2013 14:04:54 +0100
|
Date: Wed, 18 Sep 2013 14:04:54 +0100
|
||||||
Subject: [PATCH] sdl.c: allow user to disable pointer grabs
|
Subject: [PATCH] sdl.c: allow user to disable pointer grabs
|
||||||
|
|
||||||
Signed-off-by: Ross Burton <ross.burton@intel.com>
|
Signed-off-by: Ross Burton <ross.burton@intel.com>
|
||||||
|
Signed-off-by: Eric Bénard <eric@eukrea.com>
|
||||||
---
|
---
|
||||||
ui/sdl.c | 9 +++++++--
|
ui/sdl.c | 12 ++++++++++--
|
||||||
1 file changed, 7 insertions(+), 2 deletions(-)
|
1 file changed, 10 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
diff --git a/ui/sdl.c b/ui/sdl.c
|
diff --git a/ui/sdl.c b/ui/sdl.c
|
||||||
index 39a42d6..6095aa6 100644
|
index 39a42d6..9b8abe5 100644
|
||||||
--- a/ui/sdl.c
|
--- a/ui/sdl.c
|
||||||
+++ b/ui/sdl.c
|
+++ b/ui/sdl.c
|
||||||
@@ -59,6 +59,7 @@ static SDL_Cursor *guest_sprite = NULL;
|
@@ -59,6 +59,10 @@ static SDL_Cursor *guest_sprite = NULL;
|
||||||
static SDL_PixelFormat host_format;
|
static SDL_PixelFormat host_format;
|
||||||
static int scaling_active = 0;
|
static int scaling_active = 0;
|
||||||
static Notifier mouse_mode_notifier;
|
static Notifier mouse_mode_notifier;
|
||||||
|
+#ifndef True
|
||||||
|
+#define True 1
|
||||||
|
+#endif
|
||||||
+static doing_grabs = True;
|
+static doing_grabs = True;
|
||||||
|
|
||||||
static void sdl_update(DisplayChangeListener *dcl,
|
static void sdl_update(DisplayChangeListener *dcl,
|
||||||
int x, int y, int w, int h)
|
int x, int y, int w, int h)
|
||||||
@@ -384,14 +385,16 @@ static void sdl_grab_start(void)
|
@@ -384,14 +388,16 @@ static void sdl_grab_start(void)
|
||||||
SDL_WarpMouse(guest_x, guest_y);
|
SDL_WarpMouse(guest_x, guest_y);
|
||||||
} else
|
} else
|
||||||
sdl_hide_cursor();
|
sdl_hide_cursor();
|
||||||
|
@ -55,7 +58,7 @@ index 39a42d6..6095aa6 100644
|
||||||
gui_grab = 0;
|
gui_grab = 0;
|
||||||
sdl_show_cursor();
|
sdl_show_cursor();
|
||||||
sdl_update_caption();
|
sdl_update_caption();
|
||||||
@@ -909,6 +912,8 @@ void sdl_display_init(DisplayState *ds,
|
@@ -909,6 +915,8 @@ void sdl_display_init(DisplayState *ds, int full_screen, int no_frame)
|
||||||
* This requires SDL >= 1.2.14. */
|
* This requires SDL >= 1.2.14. */
|
||||||
setenv("SDL_DISABLE_LOCK_KEYS", "1", 1);
|
setenv("SDL_DISABLE_LOCK_KEYS", "1", 1);
|
||||||
|
|
||||||
|
@ -65,5 +68,5 @@ index 39a42d6..6095aa6 100644
|
||||||
if (SDL_Init (flags)) {
|
if (SDL_Init (flags)) {
|
||||||
fprintf(stderr, "Could not initialize SDL(%s) - exiting\n",
|
fprintf(stderr, "Could not initialize SDL(%s) - exiting\n",
|
||||||
--
|
--
|
||||||
1.7.10.4
|
1.8.3.1
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue