[MPlayer-cvslog] r27784 - in trunk: configure libvo/vo_dxr2.c libvo/x11_common.h

[diego]

Author: diego
Date: Thu Oct 16 20:19:36 2008
New Revision: 27784

Log:
Move X11_FULLSCREEN definition to x11_common.h where it belongs.
config.h should only contain option definitions, no code.


Modified:
   trunk/configure
   trunk/libvo/vo_dxr2.c
   trunk/libvo/x11_common.h

Modified: trunk/configure
==============================================================================
--- trunk/configure	(original)
+++ trunk/configure	Thu Oct 16 20:19:36 2008
@@ -8607,9 +8607,6 @@ $_def_tga
 /* Define this if you have shm support */
 $_def_shm
 
-#if defined(CONFIG_GL) || defined(CONFIG_X11) || defined(CONFIG_XV)
-#define X11_FULLSCREEN 1
-#endif
 
 /* FFmpeg */
 /* Define this to enable image postprocessing in libavcodec */

Modified: trunk/libvo/vo_dxr2.c
==============================================================================
--- trunk/libvo/vo_dxr2.c	(original)
+++ trunk/libvo/vo_dxr2.c	Thu Oct 16 20:19:36 2008
@@ -20,10 +20,7 @@
 #include "sub.h"
 #include "get_path.h"
 #include "libmpdemux/mpeg_packetizer.h"
-
-#ifdef X11_FULLSCREEN
 #include "x11_common.h"
-#endif
 
 #include <dxr2ioctl.h>
 

Modified: trunk/libvo/x11_common.h
==============================================================================
--- trunk/libvo/x11_common.h	(original)
+++ trunk/libvo/x11_common.h	Thu Oct 16 20:19:36 2008
@@ -4,6 +4,12 @@
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
 
+#include "config.h"
+
+#if defined(CONFIG_GL) || defined(CONFIG_X11) || defined(CONFIG_XV)
+#define X11_FULLSCREEN 1
+#endif
+
 #ifdef X11_FULLSCREEN
 
 #define vo_wm_LAYER 1