diff options
| author | Alan Coopersmith <alan.coopersmith@sun.com> | 2009-09-14 19:51:23 -0700 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2009-09-16 12:06:07 +1000 |
| commit | fe31f9c646bc26163497f29c3b833c090df0b3f9 (patch) | |
| tree | 8ea45a76c0504111a58561c644e4de3e26ea2c5b | |
| parent | 159e03204093991ccd4133133c50c0cae88c828f (diff) | |
Change xf86dristr.h includes to use xf86driproto.h instead
Clears warnings about obsolete headers, but raises minimum
required version of xf86driproto to 2.1.0
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | glx/glxdri.c | 2 | ||||
| -rw-r--r-- | hw/kdrive/ephyr/XF86dri.c | 2 | ||||
| -rw-r--r-- | hw/kdrive/ephyr/ephyrdriext.c | 2 | ||||
| -rw-r--r-- | hw/xfree86/dri/dri.c | 2 | ||||
| -rw-r--r-- | hw/xfree86/dri/drimodule.c | 2 | ||||
| -rw-r--r-- | hw/xfree86/dri/xf86dri.c | 2 |
7 files changed, 7 insertions, 7 deletions
diff --git a/configure.ac b/configure.ac index fcbeed8fe..f6b91cdcb 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 c9d226bdf..6122653b0 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 e94a7f0f0..08123d35c 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 84885d8f0..323ebefce 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 d32b284ed..3d7724d8f 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 3aa9245b9..28f6ad8c0 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 d3e5e688a..75344b78f 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" |