aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/hw/dmx/glxProxy/glxcmds.c
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2010-05-27 06:18:40 +0000
committermarha <marha@users.sourceforge.net>2010-05-27 06:18:40 +0000
commit80cb6bca9f771ef15c00cc41af2b9f315d66258d (patch)
tree3e011c7a2ef76372082dcba8d8cb6c9bd942b89f /xorg-server/hw/dmx/glxProxy/glxcmds.c
parentfade1b113f18f3fd26c3c01ca4543effa80b9b62 (diff)
downloadvcxsrv-80cb6bca9f771ef15c00cc41af2b9f315d66258d.tar.gz
vcxsrv-80cb6bca9f771ef15c00cc41af2b9f315d66258d.tar.bz2
vcxsrv-80cb6bca9f771ef15c00cc41af2b9f315d66258d.zip
xserver git update 27/5/2010
Diffstat (limited to 'xorg-server/hw/dmx/glxProxy/glxcmds.c')
-rw-r--r--xorg-server/hw/dmx/glxProxy/glxcmds.c9
1 files changed, 2 insertions, 7 deletions
diff --git a/xorg-server/hw/dmx/glxProxy/glxcmds.c b/xorg-server/hw/dmx/glxProxy/glxcmds.c
index a2fe0b27b..bac4478da 100644
--- a/xorg-server/hw/dmx/glxProxy/glxcmds.c
+++ b/xorg-server/hw/dmx/glxProxy/glxcmds.c
@@ -3404,7 +3404,7 @@ int __glXGetDrawableAttributes(__GLXclientState *cl, GLbyte *pc)
WriteToClient(client, attribs_size, (char *)attribs);
}
- Xfree(attribs);
+ free(attribs);
return Success;
}
@@ -3420,11 +3420,6 @@ int __glXChangeDrawableAttributes(__GLXclientState *cl, GLbyte *pc)
Display *dpy;
int screen, rc;
DMXScreenInfo *dmxScreen;
- char *attrbuf;
-#ifdef PANORAMIX
- PanoramiXRes *pXinDraw = NULL;
- PanoramiXRes *pXinReadDraw = NULL;
-#endif
if (drawId != None) {
rc = dixLookupDrawable(&pDraw, drawId, client, 0, DixSetAttrAccess);
@@ -3491,7 +3486,7 @@ int __glXChangeDrawableAttributes(__GLXclientState *cl, GLbyte *pc)
#ifdef PANORAMIX
if (!noPanoramiXExtension) {
- pXinDraw = (PanoramiXRes *)
+ PanoramiXRes *pXinDraw = (PanoramiXRes *)
SecurityLookupIDByClass(client, pDraw->id, XRC_DRAWABLE, DixReadAccess);
if (!pXinDraw) {
client->errorValue = drawId;