frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Alan Coopersmith 2009-09-14 19:51:23 -07:00 committed by Peter Hutterer
parent 159e032040
commit fe31f9c646
7 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.ac
View File

@ -893,7 +893,7 @@ AC_SUBST([GLX_DEFINES])
AM_CONDITIONAL(DRI, test "x$DRI" = xyes) AM_CONDITIONAL(DRI, test "x$DRI" = xyes)
if test "x$DRI" = xyes; then if test "x$DRI" = xyes; then
AC_DEFINE(XF86DRI, 1, [Build DRI extension]) 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]) PKG_CHECK_MODULES([DRI], [glproto >= 1.4.1 dri >= 7.1.0])
AC_SUBST(DRIPROTO_CFLAGS) AC_SUBST(DRIPROTO_CFLAGS)
fi fi

2
glx/glxdri.c
View File

@ -43,7 +43,7 @@
#define _XF86DRI_SERVER_ #define _XF86DRI_SERVER_
#include <drm_sarea.h> #include <drm_sarea.h>
#include <xf86drm.h> #include <xf86drm.h>
#include <xf86dristr.h> #include <X11/dri/xf86driproto.h>
#include <xf86str.h> #include <xf86str.h>
#include <xf86.h> #include <xf86.h>
#include <dri.h> #include <dri.h>

2
hw/kdrive/ephyr/XF86dri.c
View File

@ -63,7 +63,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <X11/extensions/extutil.h> #include <X11/extensions/extutil.h>
#include <GL/glx.h> #include <GL/glx.h>
#include "xf86dri.h" #include "xf86dri.h"
#include <X11/dri/xf86dristr.h> #include <X11/dri/xf86driproto.h>
static XExtensionInfo _xf86dri_info_data; static XExtensionInfo _xf86dri_info_data;
static XExtensionInfo *xf86dri_info = &_xf86dri_info_data; static XExtensionInfo *xf86dri_info = &_xf86dri_info_data;

2
hw/kdrive/ephyr/ephyrdriext.c
View File

@ -38,7 +38,7 @@
#include <X11/Xproto.h> #include <X11/Xproto.h>
#define _XF86DRI_SERVER_ #define _XF86DRI_SERVER_
#include <X11/dri/xf86dri.h> #include <X11/dri/xf86dri.h>
#include <X11/dri/xf86dristr.h> #include <X11/dri/xf86driproto.h>
#include "misc.h" #include "misc.h"
#include "privates.h" #include "privates.h"
#include "dixstruct.h" #include "dixstruct.h"

2
hw/xfree86/dri/dri.c
View File

@ -57,7 +57,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "windowstr.h" #include "windowstr.h"
#include "servermd.h" #include "servermd.h"
#define _XF86DRI_SERVER_ #define _XF86DRI_SERVER_
#include "xf86dristr.h" #include <X11/dri/xf86driproto.h>
#include "swaprep.h" #include "swaprep.h"
#include "xf86str.h" #include "xf86str.h"
#include "dri.h" #include "dri.h"

2
hw/xfree86/dri/drimodule.c
View File

@ -60,7 +60,7 @@ static XF86ModuleVersionInfo VersRec =
extern void XFree86DRIExtensionInit(INITARGS); extern void XFree86DRIExtensionInit(INITARGS);
#define _XF86DRI_SERVER_ #define _XF86DRI_SERVER_
#include "xf86dristr.h" #include <X11/dri/xf86driproto.h>
static ExtensionModule XF86DRIExt = static ExtensionModule XF86DRIExt =
{ {

2
hw/xfree86/dri/xf86dri.c
View File

@ -52,7 +52,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "scrnintstr.h" #include "scrnintstr.h"
#include "servermd.h" #include "servermd.h"
#define _XF86DRI_SERVER_ #define _XF86DRI_SERVER_
#include "xf86dristr.h" #include <X11/dri/xf86driproto.h>
#include "swaprep.h" #include "swaprep.h"
#include "xf86str.h" #include "xf86str.h"
#include "dri.h" #include "dri.h"