From 9ca9d19206114788da85c81a5aba2525baef80cb Mon Sep 17 00:00:00 2001 From: Alan Coopersmith Date: Mon, 12 Oct 2009 18:00:15 -0700 Subject: Use Xxf86dga.h & xf86dgaproto.h if present, to avoid warnings from old headers Signed-off-by: Alan Coopersmith --- configure.ac | 2 +- xdpyinfo.c | 12 +++++++++--- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index 0ed78b0..5d4e904 100644 --- a/configure.ac +++ b/configure.ac @@ -69,7 +69,7 @@ if test "x$USE_DGA" != "xno" ; then PKG_CHECK_MODULES(DPY_XF86DGA, xxf86dga, [SAVE_CPPFLAGS="$CPPFLAGS" CPPFLAGS="$CPPFLAGS $DPY_XF86DGA_CFLAGS $DPY_X11_CFLAGS" - AC_CHECK_HEADERS([X11/extensions/xf86dga.h X11/extensions/xf86dgastr.h],,, + AC_CHECK_HEADERS([X11/extensions/Xxf86dga.h X11/extensions/xf86dgaproto.h X11/extensions/xf86dga.h X11/extensions/xf86dgastr.h],,, [#include #include ]) CPPFLAGS="$SAVE_CPPFLAGS"],[echo "not found"]) diff --git a/xdpyinfo.c b/xdpyinfo.c index 21b8412..dc9829a 100644 --- a/xdpyinfo.c +++ b/xdpyinfo.c @@ -51,7 +51,8 @@ in this Software without prior written authorization from The Open Group. # define XF86VIDMODE # endif -# if HAVE_X11_EXTENSIONS_XF86DGA_H && HAVE_X11_EXTENSIONS_XF86DGASTR_H +# if (HAVE_X11_EXTENSIONS_XXF86DGA_H && HAVE_X11_EXTENSIONS_XF86DGAPROTO_H) \ + || (HAVE_X11_EXTENSIONS_XF86DGA_H && HAVE_X11_EXTENSIONS_XF86DGASTR_H) # define XFreeXDGA # endif @@ -112,8 +113,13 @@ in this Software without prior written authorization from The Open Group. # endif #endif #ifdef XFreeXDGA -#include -#include +# if HAVE_X11_EXTENSIONS_XXF86DGA_H && HAVE_X11_EXTENSIONS_XF86DGAPROTO_H +# include +# include +# else +# include +# include +# endif #endif #ifdef XF86MISC #include -- cgit v1.2.3