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/x11_common.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/x11_common.c')
| -rw-r--r-- | libvo/x11_common.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libvo/x11_common.c b/libvo/x11_common.c index 5c21fee975..08252198d3 100644 --- a/libvo/x11_common.c +++ b/libvo/x11_common.c @@ -561,7 +561,7 @@ void vo_uninit(void) #include "wskeys.h" #ifdef XF86XK_AudioPause -static const struct keymap keysym_map[] = { +static const struct mp_keymap keysym_map[] = { {XF86XK_MenuKB, KEY_MENU}, {XF86XK_AudioPlay, KEY_PLAY}, {XF86XK_AudioPause, KEY_PAUSE}, {XF86XK_AudioStop, KEY_STOP}, {XF86XK_AudioPrev, KEY_PREV}, {XF86XK_AudioNext, KEY_NEXT}, @@ -577,7 +577,7 @@ static void vo_x11_putkey_ext(int keysym) } #endif -static const struct keymap keymap[] = { +static const struct mp_keymap keymap[] = { // special keys {wsEscape, KEY_ESC}, {wsBackSpace, KEY_BS}, {wsTab, KEY_TAB}, {wsEnter, KEY_ENTER}, |