On Mon, Sep 21, 2009 at 04:30:35PM -0700, Alan Coopersmith wrote: > Clears warnings when built with xf86vidmodeproto 2.2.99.1 & later > > Signed-off-by: Alan Coopersmith <[email protected]> > --- > configure.ac | 2 +- > xdpyinfo.c | 9 +++++++-- > 2 files changed, 8 insertions(+), 3 deletions(-) > > diff --git a/configure.ac b/configure.ac > index dfd8c83..0ed78b0 100644 > --- a/configure.ac > +++ b/configure.ac > @@ -60,7 +60,7 @@ PKG_CHECK_MODULES(DPY_XKB, x11, > PKG_CHECK_MODULES(DPY_XF86VIDMODE, xxf86vm, > [SAVE_CPPFLAGS="$CPPFLAGS" > CPPFLAGS="$CPPFLAGS $DPY_XF86VIDMODE_CFLAGS $DPY_X11_CFLAGS" > - AC_CHECK_HEADERS([X11/extensions/xf86vmode.h > X11/extensions/xf86vmstr.h],,,[#include <X11/Xlib.h>]) > + AC_CHECK_HEADERS([X11/extensions/xf86vmode.h X11/extensions/xf86vmstr.h > X11/extensions/xf86vmproto.h],,,[#include <X11/Xlib.h>]) > CPPFLAGS="$SAVE_CPPFLAGS"],[echo "not found"]) > > AC_ARG_WITH(dga, AC_HELP_STRING([--without-dga],[Disable dga support.]), > diff --git a/xdpyinfo.c b/xdpyinfo.c > index 1125aa4..21b8412 100644 > --- a/xdpyinfo.c > +++ b/xdpyinfo.c > @@ -46,7 +46,8 @@ in this Software without prior written authorization from > The Open Group. > # define XKB > # endif > > -# if HAVE_X11_EXTENSIONS_XF86VMODE_H && HAVE_X11_EXTENSIONS_XF86VMSTR_H > +# if HAVE_X11_EXTENSIONS_XF86VMODE_H && \ > + (HAVE_X11_EXTENSIONS_XF86VMSTR_H || HAVE_X11_EXTENSIONS_XF86VMPROTO_H) > # define XF86VIDMODE > # endif > > @@ -104,7 +105,11 @@ in this Software without prior written authorization > from The Open Group. > #endif > #ifdef XF86VIDMODE > #include <X11/extensions/xf86vmode.h> > -#include <X11/extensions/xf86vmstr.h> > +# if HAVE_X11_EXTENSIONS_XF86VMPROTO_H /* xf86vidmodeproto 2.2.99.1 & later > */ > +# include <X11/extensions/xf86vmproto.h> > +# else > +# include <X11/extensions/xf86vmstr.h> > +# endif > #endif > #ifdef XFreeXDGA > #include <X11/extensions/xf86dga.h> > -- > 1.5.6.5
Acked-by: Peter Hutterer <[email protected]> _______________________________________________ xorg-devel mailing list [email protected] http://lists.x.org/mailman/listinfo/xorg-devel
