diff options
author | wm4 <wm4@nowhere> | 2014-08-16 21:57:51 +0200 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2014-08-16 21:57:51 +0200 |
commit | f8f3a1b4a196cd893abb7e9042f6a5cbea00affa (patch) | |
tree | f390d5985c3b3cc01eec26145946d6abcfdd2ff8 /video | |
parent | fe782a6e957c1f2d472a91eceef01ca5fd6f5cb7 (diff) | |
download | mpv-f8f3a1b4a196cd893abb7e9042f6a5cbea00affa.tar.bz2 mpv-f8f3a1b4a196cd893abb7e9042f6a5cbea00affa.tar.xz |
build: drop check for XF86keysym.h
This is always included in the Xorg development headers. Strictly
speaking it's not necessarily available with other X implementations,
but these are hopefully all dead.
Diffstat (limited to 'video')
-rw-r--r-- | video/out/x11_common.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/video/out/x11_common.c b/video/out/x11_common.c index 7863506cf3..d528456e28 100644 --- a/video/out/x11_common.c +++ b/video/out/x11_common.c @@ -46,6 +46,7 @@ #include <X11/Xatom.h> #include <X11/keysym.h> #include <X11/XKBlib.h> +#include <X11/XF86keysym.h> #if HAVE_XSS #include <X11/extensions/scrnsaver.h> @@ -59,10 +60,6 @@ #include <X11/extensions/Xinerama.h> #endif -#if HAVE_XF86XK -#include <X11/XF86keysym.h> -#endif - #if HAVE_XRANDR #include <X11/extensions/Xrandr.h> #endif @@ -544,7 +541,6 @@ static const struct mp_keymap keymap[] = { {XK_KP_Right, MP_KEY_KP6}, {XK_KP_Home, MP_KEY_KP7}, {XK_KP_Up, MP_KEY_KP8}, {XK_KP_Page_Up, MP_KEY_KP9}, {XK_KP_Delete, MP_KEY_KPDEL}, -#ifdef XF86XK_AudioPause {XF86XK_MenuKB, MP_KEY_MENU}, {XF86XK_AudioPlay, MP_KEY_PLAY}, {XF86XK_AudioPause, MP_KEY_PAUSE}, {XF86XK_AudioStop, MP_KEY_STOP}, {XF86XK_AudioPrev, MP_KEY_PREV}, @@ -554,7 +550,6 @@ static const struct mp_keymap keymap[] = { {XF86XK_HomePage, MP_KEY_HOMEPAGE}, {XF86XK_WWW, MP_KEY_WWW}, {XF86XK_Mail, MP_KEY_MAIL}, {XF86XK_Favorites, MP_KEY_FAVORITES}, {XF86XK_Search, MP_KEY_SEARCH}, {XF86XK_Sleep, MP_KEY_SLEEP}, -#endif {0, 0} }; |