[Mplayer-cvslog] CVS: main mplayer.c,1.720,1.721

[Alex Beregszaszi]

Update of /cvsroot/mplayer/main
In directory mail:/var/tmp.root/cvs-serv24448

Modified Files:
	mplayer.c 
Log Message:
X11_FULLSCREEN vs HAVE_X11 definitions and some warning fixes

Index: mplayer.c
===================================================================
RCS file: /cvsroot/mplayer/main/mplayer.c,v
retrieving revision 1.720
retrieving revision 1.721
diff -u -r1.720 -r1.721
--- mplayer.c	17 Aug 2003 19:18:29 -0000	1.720
+++ mplayer.c	18 Aug 2003 14:05:30 -0000	1.721
@@ -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