diff libvo/vo_kva.c @ 31017:fca6cfc4d5ca

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'.

--- a/libvo/vo_kva.c	Fri Apr 23 10:04:56 2010 +0000
+++ b/libvo/vo_kva.c	Fri Apr 23 10:22:44 2010 +0000
@@ -70,7 +70,7 @@
 
 #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 @@
     {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 @@
     {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},