From a290af1657a7c024e903a875fe1a886407aadc16 Mon Sep 17 00:00:00 2001
From: diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Thu, 16 Oct 2008 18:19:36 +0000
Subject: [PATCH] Move X11_FULLSCREEN definition to x11_common.h where it
 belongs. config.h should only contain option definitions, no logic.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27784 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 configure          | 3 ---
 libvo/vo_dxr2.c    | 3 ---
 libvo/x11_common.h | 6 ++++++
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/configure b/configure
index a82c271fd2..0a528aa33c 100755
--- a/configure
+++ b/configure
@@ -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 */
diff --git a/libvo/vo_dxr2.c b/libvo/vo_dxr2.c
index 93ad86f610..36281aa145 100644
--- a/libvo/vo_dxr2.c
+++ b/libvo/vo_dxr2.c
@@ -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>
 
diff --git a/libvo/x11_common.h b/libvo/x11_common.h
index 7272378f9a..50bed0f599 100644
--- a/libvo/x11_common.h
+++ b/libvo/x11_common.h
@@ -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