summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorClément Bœsch <ubitux@gmail.com>2011-03-09 20:39:13 +0100
committerUoti Urpala <uau@mplayer2.org>2011-04-20 04:22:53 +0300
commit699bf9dcd3793d9ce710067861df2df14cfa9e57 (patch)
tree32047614606e235ed5a0f2c02406e65009c04623
parent52743acba37451121d0820150694d13e2f660774 (diff)
downloadmpv-699bf9dcd3793d9ce710067861df2df14cfa9e57.tar.bz2
mpv-699bf9dcd3793d9ce710067861df2df14cfa9e57.tar.xz
vo_dga: replace xf86dga.h with Xxf86dga.h
xf86dga.h is deprecated and may be removed in the future.
-rwxr-xr-xconfigure4
-rw-r--r--libvo/vo_3dfx.c2
-rw-r--r--libvo/vo_dga.c2
3 files changed, 4 insertions, 4 deletions
diff --git a/configure b/configure
index 4609eba591..975413261e 100755
--- a/configure
+++ b/configure
@@ -4036,11 +4036,11 @@ echores "$_xf86keysym"
echocheck "DGA"
if test "$_dga2" = auto && test "$_x11" = yes ; then
_dga2=no
- statement_check_broken X11/Xlib.h X11/extensions/xf86dga.h 'XDGASetViewport(0, 0, 0, 0, 0)' -lXxf86dga && _dga2=yes
+ statement_check_broken X11/Xlib.h X11/extensions/Xxf86dga.h 'XDGASetViewport(0, 0, 0, 0, 0)' -lXxf86dga && _dga2=yes
fi
if test "$_dga1" = auto && test "$_dga2" = no && test "$_vm" = yes ; then
_dga1=no
- statement_check_broken X11/Xlib.h X11/extensions/xf86dga.h 'XF86DGASetViewPort(0, 0, 0, 0)' -lXxf86dga -lXxf86vm && _dga1=yes
+ statement_check_broken X11/Xlib.h X11/extensions/Xxf86dga.h 'XF86DGASetViewPort(0, 0, 0, 0)' -lXxf86dga -lXxf86vm && _dga1=yes
fi
_dga=no
diff --git a/libvo/vo_3dfx.c b/libvo/vo_3dfx.c
index 2595b415e5..4f7e41e9f8 100644
--- a/libvo/vo_3dfx.c
+++ b/libvo/vo_3dfx.c
@@ -40,7 +40,7 @@
#include <signal.h>
#include <X11/Xlib.h>
-#include <X11/extensions/xf86dga.h>
+#include <X11/extensions/Xxf86dga.h>
#include <X11/Xutil.h>
//#define LOG(x) syslog(LOG_USER | LOG_DEBUG,x)
diff --git a/libvo/vo_dga.c b/libvo/vo_dga.c
index 94d42774a8..001d112e8f 100644
--- a/libvo/vo_dga.c
+++ b/libvo/vo_dga.c
@@ -35,7 +35,7 @@
#include "mp_msg.h"
#include <X11/Xlib.h>
-#include <X11/extensions/xf86dga.h>
+#include <X11/extensions/Xxf86dga.h>
#ifdef CONFIG_XF86VM
#include <X11/extensions/xf86vmode.h>