Clears warnings about obsolete headers, but raises minimum required version of xf86driproto to 2.1.0
Signed-off-by: Alan Coopersmith <[email protected]> --- configure.ac | 2 +- glx/glxdri.c | 2 +- hw/kdrive/ephyr/XF86dri.c | 2 +- hw/kdrive/ephyr/ephyrdriext.c | 2 +- hw/xfree86/dri/dri.c | 2 +- hw/xfree86/dri/drimodule.c | 2 +- hw/xfree86/dri/xf86dri.c | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/configure.ac b/configure.ac index fcbeed8..f6b91cd 100644 --- a/configure.ac +++ b/configure.ac @@ -893,7 +893,7 @@ AC_SUBST([GLX_DEFINES]) AM_CONDITIONAL(DRI, test "x$DRI" = xyes) if test "x$DRI" = xyes; then AC_DEFINE(XF86DRI, 1, [Build DRI extension]) - PKG_CHECK_MODULES([DRIPROTO], [xf86driproto]) + PKG_CHECK_MODULES([DRIPROTO], [xf86driproto >= 2.1.0]) PKG_CHECK_MODULES([DRI], [glproto >= 1.4.1 dri >= 7.1.0]) AC_SUBST(DRIPROTO_CFLAGS) fi diff --git a/glx/glxdri.c b/glx/glxdri.c index c9d226b..6122653 100644 --- a/glx/glxdri.c +++ b/glx/glxdri.c @@ -43,7 +43,7 @@ #define _XF86DRI_SERVER_ #include <drm_sarea.h> #include <xf86drm.h> -#include <xf86dristr.h> +#include <X11/dri/xf86driproto.h> #include <xf86str.h> #include <xf86.h> #include <dri.h> diff --git a/hw/kdrive/ephyr/XF86dri.c b/hw/kdrive/ephyr/XF86dri.c index e94a7f0..08123d3 100644 --- a/hw/kdrive/ephyr/XF86dri.c +++ b/hw/kdrive/ephyr/XF86dri.c @@ -63,7 +63,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <X11/extensions/extutil.h> #include <GL/glx.h> #include "xf86dri.h" -#include <X11/dri/xf86dristr.h> +#include <X11/dri/xf86driproto.h> static XExtensionInfo _xf86dri_info_data; static XExtensionInfo *xf86dri_info = &_xf86dri_info_data; diff --git a/hw/kdrive/ephyr/ephyrdriext.c b/hw/kdrive/ephyr/ephyrdriext.c index 84885d8..323ebef 100644 --- a/hw/kdrive/ephyr/ephyrdriext.c +++ b/hw/kdrive/ephyr/ephyrdriext.c @@ -38,7 +38,7 @@ #include <X11/Xproto.h> #define _XF86DRI_SERVER_ #include <X11/dri/xf86dri.h> -#include <X11/dri/xf86dristr.h> +#include <X11/dri/xf86driproto.h> #include "misc.h" #include "privates.h" #include "dixstruct.h" diff --git a/hw/xfree86/dri/dri.c b/hw/xfree86/dri/dri.c index d32b284..3d7724d 100644 --- a/hw/xfree86/dri/dri.c +++ b/hw/xfree86/dri/dri.c @@ -57,7 +57,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "windowstr.h" #include "servermd.h" #define _XF86DRI_SERVER_ -#include "xf86dristr.h" +#include <X11/dri/xf86driproto.h> #include "swaprep.h" #include "xf86str.h" #include "dri.h" diff --git a/hw/xfree86/dri/drimodule.c b/hw/xfree86/dri/drimodule.c index 3aa9245..28f6ad8 100644 --- a/hw/xfree86/dri/drimodule.c +++ b/hw/xfree86/dri/drimodule.c @@ -60,7 +60,7 @@ static XF86ModuleVersionInfo VersRec = extern void XFree86DRIExtensionInit(INITARGS); #define _XF86DRI_SERVER_ -#include "xf86dristr.h" +#include <X11/dri/xf86driproto.h> static ExtensionModule XF86DRIExt = { diff --git a/hw/xfree86/dri/xf86dri.c b/hw/xfree86/dri/xf86dri.c index d3e5e68..75344b7 100644 --- a/hw/xfree86/dri/xf86dri.c +++ b/hw/xfree86/dri/xf86dri.c @@ -52,7 +52,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "scrnintstr.h" #include "servermd.h" #define _XF86DRI_SERVER_ -#include "xf86dristr.h" +#include <X11/dri/xf86driproto.h> #include "swaprep.h" #include "xf86str.h" #include "dri.h" -- 1.5.6.5 _______________________________________________ xorg-devel mailing list [email protected] http://lists.x.org/mailman/listinfo/xorg-devel
