From 5d8f37ad78fc66901af50c762029a501561f3b23 Mon Sep 17 00:00:00 2001 From: David 'Digit' Turner Date: Mon, 14 Sep 2009 14:32:27 -0700 Subject: Merge upstream QEMU 10.0.50 into the Android source tree. This change integrates many changes from the upstream QEMU sources. Its main purpose is to enable correct ARMv6 and ARMv7 support to the Android emulator. Due to the nature of the upstream code base, this unfortunately also required changes to many other parts of the source. Note that to ensure easier integrations in the future, some source files and directories that have heavy Android-specific customization have been renamed with an -android suffix. The original files are still there for easier integration tracking, but *never* compiled. For example: net.c net-android.c qemu-char.c qemu-char-android.c slirp/ slirp-android/ etc... Tested on linux-x86, darwin-x86 and windows host machines. --- sdl_keysym.h | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'sdl_keysym.h') diff --git a/sdl_keysym.h b/sdl_keysym.h index 9a74142..c213ef8 100644 --- a/sdl_keysym.h +++ b/sdl_keysym.h @@ -1,8 +1,7 @@ -typedef struct { - const char* name; - int keysym; -} name2keysym_t; -static name2keysym_t name2keysym[]={ + +#include "keymaps.h" + +static const name2keysym_t name2keysym[]={ /* ascii */ { "space", 0x020}, { "exclam", 0x021}, -- cgit v1.1