diff options
| author | alex <alex@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2003-08-18 14:05:30 +0000 |
|---|---|---|
| committer | alex <alex@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2003-08-18 14:05:30 +0000 |
| commit | 4eb73ff345be387eda6df7b40cdfdde6f6e73fd4 (patch) | |
| tree | 103f07d949d701869006cbb30cc203ce5c1df064 /mplayer.c | |
| parent | 06f1a02f0058cd234293586927a4f3ca4d88d53c (diff) | |
| download | mpv-4eb73ff345be387eda6df7b40cdfdde6f6e73fd4.tar.bz2 mpv-4eb73ff345be387eda6df7b40cdfdde6f6e73fd4.tar.xz | |
X11_FULLSCREEN vs HAVE_X11 definitions and some warning fixes
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10662 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'mplayer.c')
| -rw-r--r-- | mplayer.c | 10 |
1 files changed, 4 insertions, 6 deletions
@@ -150,7 +150,9 @@ static int cfg_include(m_option_t *conf, char *filename){ // XScreensaver //**************************************************************************// +#ifdef HAVE_X11 void xscreensaver_heartbeat(float time); +#endif //**************************************************************************// //**************************************************************************// @@ -449,14 +451,10 @@ static void uninit_player(unsigned int mask){ current_module=NULL; } -#ifdef X11_FULLSCREEN -extern void vo_uninit( void ); -#endif - static void exit_player_with_rc(char* how, int rc){ uninit_player(INITED_ALL); -#ifdef X11_FULLSCREEN +#ifdef HAVE_X11 #ifdef HAVE_NEW_GUI if ( !use_gui ) #endif @@ -1518,7 +1516,7 @@ if(sh_video){ sh_video->frametime=1.0f/sh_video->fps; } vo_fps = sh_video->fps; -#ifdef X11_FULLSCREEN +#ifdef HAVE_X11 vo_mouse_timer_const=(int)sh_video->fps; #endif |