diff options
| author | marha <marha@users.sourceforge.net> | 2010-05-27 06:40:50 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-05-27 06:40:50 +0000 |
| commit | 619d6f3626f36af85cc40eeee95c7585d906fe5c (patch) | |
| tree | 0428401464cc6127a651c94261678072cb3bafc3 /xorg-server/hw/dmx/glxProxy/glxcmds.c | |
| parent | d89c0289565a662a378df6e3c05de42982ab1c9d (diff) | |
| parent | 80cb6bca9f771ef15c00cc41af2b9f315d66258d (diff) | |
| download | vcxsrv-619d6f3626f36af85cc40eeee95c7585d906fe5c.tar.gz vcxsrv-619d6f3626f36af85cc40eeee95c7585d906fe5c.tar.bz2 vcxsrv-619d6f3626f36af85cc40eeee95c7585d906fe5c.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'xorg-server/hw/dmx/glxProxy/glxcmds.c')
| -rw-r--r-- | xorg-server/hw/dmx/glxProxy/glxcmds.c | 9 |
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;
|