diff options
| author | marha <marha@users.sourceforge.net> | 2009-09-24 10:49:08 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2009-09-24 10:49:08 +0000 |
| commit | 67b353c9ce039b254ba2e92cd6f842c505a8bd21 (patch) | |
| tree | edb5f3ff6a9564a50f3b701913ab2b3aafa80a95 /xorg-server/hw/xfree86/dri/xf86dri.c | |
| parent | f3d88db0960f1c23e55f2529764b096ac92d78d9 (diff) | |
| download | vcxsrv-67b353c9ce039b254ba2e92cd6f842c505a8bd21.tar.gz vcxsrv-67b353c9ce039b254ba2e92cd6f842c505a8bd21.tar.bz2 vcxsrv-67b353c9ce039b254ba2e92cd6f842c505a8bd21.zip | |
Update following packages:
- xproto-7.0.16
- libXdmcp-1.0.3
- bdftopcf-1.0.2
- xorg-server-1.6.99.902
Diffstat (limited to 'xorg-server/hw/xfree86/dri/xf86dri.c')
| -rw-r--r-- | xorg-server/hw/xfree86/dri/xf86dri.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/xorg-server/hw/xfree86/dri/xf86dri.c b/xorg-server/hw/xfree86/dri/xf86dri.c index d3e5e688a..035057b77 100644 --- a/xorg-server/hw/xfree86/dri/xf86dri.c +++ b/xorg-server/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" @@ -60,6 +60,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "dristruct.h" #include "xf86.h" #include "xf86drm.h" +#include "protocol-versions.h" static int DRIErrorBase; @@ -134,9 +135,9 @@ ProcXF86DRIQueryVersion( rep.type = X_Reply; rep.length = 0; rep.sequenceNumber = client->sequence; - rep.majorVersion = XF86DRI_MAJOR_VERSION; - rep.minorVersion = XF86DRI_MINOR_VERSION; - rep.patchVersion = XF86DRI_PATCH_VERSION; + rep.majorVersion = SERVER_XF86DRI_MAJOR_VERSION; + rep.minorVersion = SERVER_XF86DRI_MINOR_VERSION; + rep.patchVersion = SERVER_XF86DRI_PATCH_VERSION; if (client->swapped) { swaps(&rep.sequenceNumber, n); swapl(&rep.length, n); |