# HG changeset patch # User diego # Date 1224181176 0 # Node ID 2c11b155ff115fb446f97c0cff2ece3cc450dd85 # Parent fe1ef9daa92e53ba03641c6e5c1d8e0be990934a Move X11_FULLSCREEN definition to x11_common.h where it belongs. config.h should only contain option definitions, no logic. diff -r fe1ef9daa92e -r 2c11b155ff11 configure --- a/configure Thu Oct 16 18:14:35 2008 +0000 +++ b/configure Thu Oct 16 18:19:36 2008 +0000 @@ -8607,9 +8607,6 @@ /* 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 -r fe1ef9daa92e -r 2c11b155ff11 libvo/vo_dxr2.c --- a/libvo/vo_dxr2.c Thu Oct 16 18:14:35 2008 +0000 +++ b/libvo/vo_dxr2.c Thu Oct 16 18:19:36 2008 +0000 @@ -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 diff -r fe1ef9daa92e -r 2c11b155ff11 libvo/x11_common.h --- a/libvo/x11_common.h Thu Oct 16 18:14:35 2008 +0000 +++ b/libvo/x11_common.h Thu Oct 16 18:19:36 2008 +0000 @@ -4,6 +4,12 @@ #include #include +#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