diff options
| author | siretart <siretart@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2010-04-23 10:22:44 +0000 |
|---|---|---|
| committer | siretart <siretart@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2010-04-23 10:22:44 +0000 |
| commit | 9cef48bac77cbeefe7dade7cb38fb3a00a16733a (patch) | |
| tree | 518cfb1bb7c56ae9a0e96369014425927a7bf8d9 /libvo/vo_kva.c | |
| parent | 8bd8aba37a9e9046905e7baf20568910c17b8fa7 (diff) | |
| download | mpv-9cef48bac77cbeefe7dade7cb38fb3a00a16733a.tar.bz2 mpv-9cef48bac77cbeefe7dade7cb38fb3a00a16733a.tar.xz | |
rename 'struct keymap' -> 'struct mp_keymap'
This avoids the compilation failure on kFreeBSD (at least amd64):
In file included from libvo/vo_directfb2.c:44:
libvo/video_out.h:267: error: redefinition of 'struct keymap'
This is because libvo/vo_directfb2.c #includes sys/kd.h, which in turn
includes sys/kbio.h, which defines another 'struct keymap'.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31059 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libvo/vo_kva.c')
| -rw-r--r-- | libvo/vo_kva.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libvo/vo_kva.c b/libvo/vo_kva.c index dd604fdeb5..29a739eac7 100644 --- a/libvo/vo_kva.c +++ b/libvo/vo_kva.c @@ -70,7 +70,7 @@ const LIBVO_EXTERN(kva) #define HWNDFROMWINID(wid) ((wid) + 0x80000000UL) -static const struct keymap m_vk_map[] = { +static const struct mp_keymap m_vk_map[] = { {VK_NEWLINE, KEY_ENTER}, {VK_TAB, KEY_TAB}, {VK_SPACE, ' '}, // control keys @@ -92,7 +92,7 @@ static const struct keymap m_vk_map[] = { {0, 0} }; -static const struct keymap m_keypad_map[] = { +static const struct mp_keymap m_keypad_map[] = { // keypad keys {0x52, KEY_KP0}, {0x4F, KEY_KP1}, {0x50, KEY_KP2}, {0x51, KEY_KP3}, {0x4B, KEY_KP4}, {0x4C, KEY_KP5}, {0x4D, KEY_KP6}, {0x47, KEY_KP7}, @@ -101,7 +101,7 @@ static const struct keymap m_keypad_map[] = { {0, 0} }; -static const struct keymap m_mouse_map[] = { +static const struct mp_keymap m_mouse_map[] = { {WM_BUTTON1DOWN, MOUSE_BTN0}, {WM_BUTTON3DOWN, MOUSE_BTN1}, {WM_BUTTON2DOWN, MOUSE_BTN2}, |