summaryrefslogtreecommitdiffstats
path: root/libvo/osx_common.c
diff options
context:
space:
mode:
authorUoti Urpala <uau@glyph.nonexistent.invalid>2010-04-26 19:22:56 +0300
committerUoti Urpala <uau@glyph.nonexistent.invalid>2010-04-26 19:23:32 +0300
commitf38efd166e43f5cae783f38f9913d2859557143e (patch)
tree38f49af429d4147e390f0b52384294b2e35b9d6f /libvo/osx_common.c
parent7a33e76943ecc3f2ba185a1bea56c8416b74d6dd (diff)
parent4e853e19ef349a453ef069d76b830a3dbfa444c3 (diff)
downloadmpv-f38efd166e43f5cae783f38f9913d2859557143e.tar.bz2
mpv-f38efd166e43f5cae783f38f9913d2859557143e.tar.xz
Merge svn changes up to r31097
Diffstat (limited to 'libvo/osx_common.c')
-rw-r--r--libvo/osx_common.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libvo/osx_common.c b/libvo/osx_common.c
index b3e39a62aa..315f4dbd13 100644
--- a/libvo/osx_common.c
+++ b/libvo/osx_common.c
@@ -77,7 +77,7 @@
#define kVK_UpArrow 0x7e
#endif /* MAC_OS_X_VERSION_MAX_ALLOWED <= 1040 */
-static const struct keymap keymap[] = {
+static const struct mp_keymap keymap[] = {
// special keys
{0x34, KEY_ENTER}, // Enter key on some iBooks?
{kVK_Return, KEY_ENTER},