diff options
| author | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-06-23 03:58:44 +0300 |
|---|---|---|
| committer | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-06-23 03:58:44 +0300 |
| commit | de560e8167c21a8fd9ea34f5f42f377102d65232 (patch) | |
| tree | d5ef49221ccbb17308b0d14a96e6bd8cfba5916f /cfg-common.h | |
| parent | 68e70b3ec34af2e1002d17d0dc81b3408a399ade (diff) | |
| parent | 5eee4632d3e2bcf17a29483467d247c71c202e0d (diff) | |
| download | mpv-de560e8167c21a8fd9ea34f5f42f377102d65232.tar.bz2 mpv-de560e8167c21a8fd9ea34f5f42f377102d65232.tar.xz | |
Merge svn changes up to r27123
Conflicts:
libmenu/menu_filesel.c
libmenu/menu_pt.c
Diffstat (limited to 'cfg-common.h')
| -rw-r--r-- | cfg-common.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/cfg-common.h b/cfg-common.h index ae786c6242..edffc5fbbd 100644 --- a/cfg-common.h +++ b/cfg-common.h @@ -1,7 +1,10 @@ #ifndef MPLAYER_CFG_COMMON_H #define MPLAYER_CFG_COMMON_H +#include <sys/types.h> #include "config.h" +#include "m_config.h" +#include "m_option.h" extern char *mp_msg_charset; extern int mp_msg_color; |