diff options
author | marha <marha@users.sourceforge.net> | 2012-07-18 08:33:31 +0200 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2012-07-18 08:33:31 +0200 |
commit | 2ff5448bcca8cba4b62026d5493cb08aaf2838d8 (patch) | |
tree | 355bad312548535d148aa058c089aefc81e10ab3 /xorg-server/hw/xfree86 | |
parent | d09d7be8bbbb39926f44834023d7120535155829 (diff) | |
download | vcxsrv-2ff5448bcca8cba4b62026d5493cb08aaf2838d8.tar.gz vcxsrv-2ff5448bcca8cba4b62026d5493cb08aaf2838d8.tar.bz2 vcxsrv-2ff5448bcca8cba4b62026d5493cb08aaf2838d8.zip |
fontconfig mesa xserver git update 18 Jul 2012
Diffstat (limited to 'xorg-server/hw/xfree86')
-rw-r--r-- | xorg-server/hw/xfree86/common/xf86Extensions.h | 8 | ||||
-rw-r--r-- | xorg-server/hw/xfree86/dri2/dri2ext.c | 9 |
2 files changed, 9 insertions, 8 deletions
diff --git a/xorg-server/hw/xfree86/common/xf86Extensions.h b/xorg-server/hw/xfree86/common/xf86Extensions.h index 9b8448d64..cad86c881 100644 --- a/xorg-server/hw/xfree86/common/xf86Extensions.h +++ b/xorg-server/hw/xfree86/common/xf86Extensions.h @@ -29,25 +29,25 @@ #include "extnsionst.h" #ifdef XF86DRI -extern Bool noXFree86DRIExtension; +extern _X_EXPORT Bool noXFree86DRIExtension; extern void XFree86DRIExtensionInit(void); #endif #ifdef DRI2 #include <X11/extensions/dri2proto.h> -extern Bool noDRI2Extension; +extern _X_EXPORT Bool noDRI2Extension; extern void DRI2ExtensionInit(void); #endif #ifdef XF86VIDMODE #include <X11/extensions/xf86vmproto.h> -extern Bool noXFree86VidModeExtension; +extern _X_EXPORT Bool noXFree86VidModeExtension; extern void XFree86VidModeExtensionInit(void); #endif #ifdef XFreeXDGA #include <X11/extensions/xf86dgaproto.h> -extern Bool noXFree86DGAExtension; +extern _X_EXPORT Bool noXFree86DGAExtension; extern void XFree86DGAExtensionInit(void); extern void XFree86DGARegister(void); #endif diff --git a/xorg-server/hw/xfree86/dri2/dri2ext.c b/xorg-server/hw/xfree86/dri2/dri2ext.c index eb6fd44fc..ee610c0ec 100644 --- a/xorg-server/hw/xfree86/dri2/dri2ext.c +++ b/xorg-server/hw/xfree86/dri2/dri2ext.c @@ -550,15 +550,16 @@ static int ProcDRI2GetParam(ClientPtr client) { REQUEST(xDRI2GetParamReq); - xDRI2GetParamReply rep; + xDRI2GetParamReply rep = { + .type = X_Reply, + .sequenceNumber = client->sequence, + .length = 0 + }; DrawablePtr pDrawable; CARD64 value; int status; REQUEST_SIZE_MATCH(xDRI2GetParamReq); - rep.type = X_Reply; - rep.length = 0; - rep.sequenceNumber = client->sequence; if (!validDrawable(client, stuff->drawable, DixReadAccess, &pDrawable, &status)) |