Mercurial > mplayer.hg

changeset 10661:49d7d02f4485

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
X11_FULLSCREEN vs HAVE_X11 definitions and some warning fixes
author alex
date Mon, 18 Aug 2003 14:05:30 +0000
parents 8f168a4128c5
children 5cf84c487446
files mplayer.c
diffstat 1 files changed, 4 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/mplayer.c	Mon Aug 18 13:49:22 2003 +0000
+++ b/mplayer.c	Mon Aug 18 14:05:30 2003 +0000
@@ -150,7 +150,9 @@
 //             XScreensaver
 //**************************************************************************//
 
+#ifdef HAVE_X11
 void xscreensaver_heartbeat(float time);
+#endif
 
 //**************************************************************************//
 //**************************************************************************//
@@ -449,14 +451,10 @@
   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 @@
       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