# HG changeset patch # User diego # Date 1276765958 0 # Node ID 1c540767767e43309f5fb5e5e156131434ed2278 # Parent 82fce4fb5049dbb62be8d6b8d7652377b80fc049 Move menu-related extern variable declarations to menu.h. diff -r 82fce4fb5049 -r 1c540767767e cfg-mplayer.h --- a/cfg-mplayer.h Thu Jun 17 08:38:12 2010 +0000 +++ b/cfg-mplayer.h Thu Jun 17 09:12:38 2010 +0000 @@ -25,6 +25,7 @@ #include "cfg-common.h" #include "libmpcodecs/vd.h" +#include "libmenu/menu.h" #include "libvo/aspect.h" #include "libvo/vo_fbdev.h" #include "libvo/vo_zr.h" @@ -39,13 +40,6 @@ extern char *vo_geometry; extern int stop_xscreensaver; -extern int menu_startup; -extern int menu_keepdir; -extern char *menu_chroot; -extern char *menu_fribidi_charset; -extern int menu_flip_hebrew; -extern int menu_fribidi_flip_commas; - extern char *unrar_executable; extern const m_option_t dxr2_opts[]; diff -r 82fce4fb5049 -r 1c540767767e libmenu/menu.h --- a/libmenu/menu.h Thu Jun 17 08:38:12 2010 +0000 +++ b/libmenu/menu.h Thu Jun 17 09:12:38 2010 +0000 @@ -23,6 +23,14 @@ #include "libmpcodecs/mp_image.h" #include "libmpcodecs/vf.h" +extern char *menu_chroot; +extern char *menu_fribidi_charset; +extern int menu_flip_hebrew; +extern int menu_fribidi_flip_commas; +extern int menu_keepdir; +extern int menu_startup; + + struct menu_priv_s; typedef struct menu_s menu_t;