Merge tag 'v2.6.0' into develop

[sdk/emulator/qemu.git] / ui / sdl.c

diff --git a/ui/sdl.c b/ui/sdl.c
index d8cf5bc..6ecd021 100644 (file)
--- a/ui/sdl.c
+++ b/ui/sdl.c
@@ -219,7 +219,7 @@ static uint8_t sdl_keyevent_to_keycode(const SDL_KeyboardEvent *ev)
 
 #else
 
-#if defined(SDL_VIDEO_DRIVER_X11)
+#if (defined(SDL_VIDEO_DRIVER_X11) && !defined(__APPLE__))
 #include <X11/XKBlib.h>
 
 static int check_for_evdev(void)
@@ -372,7 +372,7 @@ static void sdl_update_caption(void)
         else
             status = " - Press Ctrl-Alt to exit mouse grab";
     }
-
+    
     if (qemu_name) {
         snprintf(win_title, sizeof(win_title), "QEMU (%s)%s", qemu_name, status);
         snprintf(icon_title, sizeof(icon_title), "QEMU (%s)", qemu_name);