summaryrefslogtreecommitdiffstats
path: root/gui
diff options
context:
space:
mode:
authordiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2007-07-18 10:09:42 +0000
committerdiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2007-07-18 10:09:42 +0000
commitf2a8f10af2221ab8ac7c58633a901a697d3e3499 (patch)
tree247d05cf0262d8ecb15c62ed0c84c2ba2938a85a /gui
parentfe72927d6bba491ea3a1703892d82e6b89af93ff (diff)
downloadmpv-f2a8f10af2221ab8ac7c58633a901a697d3e3499.tar.bz2
mpv-f2a8f10af2221ab8ac7c58633a901a697d3e3499.tar.xz
Fix a bunch of redundant redeclaration warnings.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23815 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'gui')
-rw-r--r--gui/cfg.c3
-rw-r--r--gui/interface.c1
-rw-r--r--gui/mplayer/gmplayer.h1
-rw-r--r--gui/mplayer/gtk/mb.h1
-rw-r--r--gui/mplayer/gtk/pl.h2
-rw-r--r--gui/mplayer/gtk/sb.h6
-rw-r--r--gui/mplayer/menu.c2
-rw-r--r--gui/mplayer/play.c2
-rw-r--r--gui/mplayer/widgets.h2
-rw-r--r--gui/wm/ws.c5
10 files changed, 2 insertions, 23 deletions
diff --git a/gui/cfg.c b/gui/cfg.c
index f12ce3a422..1f7ef4bc7e 100644
--- a/gui/cfg.c
+++ b/gui/cfg.c
@@ -76,9 +76,6 @@ gtkASS_t gtkASS;
#endif
// ---
-extern char * get_path( const char * filename );
-extern int flip;
-extern int frame_dropping;
extern int stop_xscreensaver;
extern int m_config_parse_config_file(m_config_t* config, char *conffile);
diff --git a/gui/interface.c b/gui/interface.c
index 3be192e139..1dc00ba184 100644
--- a/gui/interface.c
+++ b/gui/interface.c
@@ -419,7 +419,6 @@ int guiCMDArray[] =
evSkinBrowser
};
-extern int frame_dropping;
extern int stream_dump_type;
extern int vcd_track;
extern m_obj_settings_t * vf_settings;
diff --git a/gui/mplayer/gmplayer.h b/gui/mplayer/gmplayer.h
index ad62b5c1b8..367aa474c1 100644
--- a/gui/mplayer/gmplayer.h
+++ b/gui/mplayer/gmplayer.h
@@ -13,7 +13,6 @@ extern int mplMainAutoPlay;
extern int mplMiddleMenu;
extern void mplInit( void * disp );
-extern void mplEventHandling( int msg,float param );
extern void mplMainDraw( void );
extern void mplEventHandling( int msg,float param );
diff --git a/gui/mplayer/gtk/mb.h b/gui/mplayer/gtk/mb.h
index 85021d52b5..2bd7cd97e0 100644
--- a/gui/mplayer/gtk/mb.h
+++ b/gui/mplayer/gtk/mb.h
@@ -4,7 +4,6 @@
#include <gtk/gtk.h>
-extern GtkWidget * gtkMessageBoxText;
extern GtkWidget * MessageBox;
extern GtkWidget * create_MessageBox( int type );
diff --git a/gui/mplayer/gtk/pl.h b/gui/mplayer/gtk/pl.h
index 9c38b1062a..5e80983ad1 100644
--- a/gui/mplayer/gtk/pl.h
+++ b/gui/mplayer/gtk/pl.h
@@ -4,8 +4,6 @@
#include <gtk/gtk.h>
-extern GtkWidget * PlayList;
-
extern void ShowPlayList( void );
extern void HidePlayList( void );
diff --git a/gui/mplayer/gtk/sb.h b/gui/mplayer/gtk/sb.h
index 6b3b8323f4..13286c103a 100644
--- a/gui/mplayer/gtk/sb.h
+++ b/gui/mplayer/gtk/sb.h
@@ -3,16 +3,10 @@
#include <gtk/gtk.h>
-extern GtkWidget * SkinList;
extern char * sbSelectedSkin;
-extern char * sbMPlayerDirInHome;
-extern char * sbMPlayerDirInHome_obsolete;
-extern char * sbMPlayerPrefixDir;
-extern char * sbMPlayerPrefixDir_obsolete;
extern GtkWidget * SkinBrowser;
extern void ShowSkinBrowser( void );
-extern int gtkFillSkinList( gchar * mdir );
extern GtkWidget * create_SkinBrowser( void );
#endif
diff --git a/gui/mplayer/menu.c b/gui/mplayer/menu.c
index 9c77c54059..f6887c4089 100644
--- a/gui/mplayer/menu.c
+++ b/gui/mplayer/menu.c
@@ -18,8 +18,6 @@ int mplOldMenuItem = -1;
int mplMenuX,mplMenuY;
static int mplMenuIsInitialized = 0;
-void mplHideMenu( int mx,int my,int w );
-
void mplMenuDraw( void )
{
uint32_t * buf = NULL;
diff --git a/gui/mplayer/play.c b/gui/mplayer/play.c
index dbec9d0e38..6a15186a74 100644
--- a/gui/mplayer/play.c
+++ b/gui/mplayer/play.c
@@ -63,8 +63,6 @@ void mplFullScreen( void )
else wsSetBackgroundRGB( &appMPlayer.subWindow,appMPlayer.sub.R,appMPlayer.sub.G,appMPlayer.sub.B );
}
-extern int mplSubRender;
-
void mplEnd( void )
{
plItem * next;
diff --git a/gui/mplayer/widgets.h b/gui/mplayer/widgets.h
index a13bb84abe..dfa7bd5048 100644
--- a/gui/mplayer/widgets.h
+++ b/gui/mplayer/widgets.h
@@ -35,6 +35,8 @@ extern int gtkPopupMenuParam;
extern char * sbMPlayerDirInHome;
extern char * sbMPlayerPrefixDir;
+extern char * sbMPlayerDirInHome_obsolete;
+extern char * sbMPlayerPrefixDir_obsolete;
extern GdkPixmap * gtkIcon;
extern GdkBitmap * gtkIconMask;
diff --git a/gui/wm/ws.c b/gui/wm/ws.c
index d64ab0a8dd..3149354631 100644
--- a/gui/wm/ws.c
+++ b/gui/wm/ws.c
@@ -50,10 +50,6 @@
#undef ENABLE_DPMS
-#ifdef HAVE_XINERAMA
-extern int xinerama_screen;
-#endif
-
typedef struct
{
unsigned long flags;
@@ -97,7 +93,6 @@ unsigned long wsKeyTable[512];
int wsUseXShm = 1;
int wsUseXShape = 1;
-int XShmGetEventBase( Display* );
inline int wsSearch( Window win );
// ---