summaryrefslogtreecommitdiffstats
path: root/qemu/ui/sdl_zoom.c
diff options
context:
space:
mode:
authorJosé Pekkarinen <jose.pekkarinen@nokia.com>2016-05-18 13:18:31 +0300
committerJosé Pekkarinen <jose.pekkarinen@nokia.com>2016-05-18 13:42:15 +0300
commit437fd90c0250dee670290f9b714253671a990160 (patch)
treeb871786c360704244a07411c69fb58da9ead4a06 /qemu/ui/sdl_zoom.c
parent5bbd6fe9b8bab2a93e548c5a53b032d1939eec05 (diff)
These changes are the raw update to qemu-2.6.
Collission happened in the following patches: migration: do cleanup operation after completion(738df5b9) Bug fix.(1750c932f86) kvmclock: add a new function to update env->tsc.(b52baab2) The code provided by the patches was already in the upstreamed version. Change-Id: I3cc11841a6a76ae20887b2e245710199e1ea7f9a Signed-off-by: José Pekkarinen <jose.pekkarinen@nokia.com>
Diffstat (limited to 'qemu/ui/sdl_zoom.c')
-rw-r--r--qemu/ui/sdl_zoom.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/qemu/ui/sdl_zoom.c b/qemu/ui/sdl_zoom.c
index 2625c4557..72622c264 100644
--- a/qemu/ui/sdl_zoom.c
+++ b/qemu/ui/sdl_zoom.c
@@ -11,11 +11,9 @@
*
*/
-#include "sdl_zoom.h"
#include "qemu/osdep.h"
+#include "sdl_zoom.h"
#include <glib.h>
-#include <stdint.h>
-#include <stdio.h>
static void sdl_zoom_rgb16(SDL_Surface *src, SDL_Surface *dst, int smooth,
SDL_Rect *dst_rect);