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/video_out.h | |
| 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/video_out.h')
| -rw-r--r-- | libvo/video_out.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libvo/video_out.h b/libvo/video_out.h index 1fce2c2877..4e8716f13e 100644 --- a/libvo/video_out.h +++ b/libvo/video_out.h @@ -269,11 +269,11 @@ extern char *monitor_hfreq_str; extern char *monitor_vfreq_str; extern char *monitor_dotclock_str; -struct keymap { +struct mp_keymap { int from; int to; }; -int lookup_keymap_table(const struct keymap *map, int key); +int lookup_keymap_table(const struct mp_keymap *map, int key); struct vo_rect { int left, right, top, bottom, width, height; }; |