diff options
| author | marha <marha@users.sourceforge.net> | 2010-05-27 06:18:40 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-05-27 06:18:40 +0000 |
| commit | 80cb6bca9f771ef15c00cc41af2b9f315d66258d (patch) | |
| tree | 3e011c7a2ef76372082dcba8d8cb6c9bd942b89f /xorg-server/hw/dmx/glxProxy/glxsingle.c | |
| parent | fade1b113f18f3fd26c3c01ca4543effa80b9b62 (diff) | |
| download | vcxsrv-80cb6bca9f771ef15c00cc41af2b9f315d66258d.tar.gz vcxsrv-80cb6bca9f771ef15c00cc41af2b9f315d66258d.tar.bz2 vcxsrv-80cb6bca9f771ef15c00cc41af2b9f315d66258d.zip | |
xserver git update 27/5/2010
Diffstat (limited to 'xorg-server/hw/dmx/glxProxy/glxsingle.c')
| -rw-r--r-- | xorg-server/hw/dmx/glxProxy/glxsingle.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/xorg-server/hw/dmx/glxProxy/glxsingle.c b/xorg-server/hw/dmx/glxProxy/glxsingle.c index 19f12ad58..8325b4afc 100644 --- a/xorg-server/hw/dmx/glxProxy/glxsingle.c +++ b/xorg-server/hw/dmx/glxProxy/glxsingle.c @@ -288,7 +288,7 @@ int __glXForwardPipe0WithReply( __GLXclientState *cl, GLbyte *pc ) WriteToClient(client, be_buf_size, (char *)be_buf);
}
- if (be_buf_size > 0) Xfree(be_buf);
+ if (be_buf_size > 0) free(be_buf);
return Success;
}
@@ -364,7 +364,7 @@ int __glXForwardAllWithReply( __GLXclientState *cl, GLbyte *pc ) SyncHandle();
if (s > from_screen && be_buf_size > 0) {
- Xfree(be_buf);
+ free(be_buf);
}
}
@@ -388,7 +388,7 @@ int __glXForwardAllWithReply( __GLXclientState *cl, GLbyte *pc ) WriteToClient(client, be_buf_size, (char *)be_buf);
}
- if (be_buf_size > 0) Xfree(be_buf);
+ if (be_buf_size > 0) free(be_buf);
return Success;
}
@@ -750,7 +750,6 @@ int __glXDisp_ReadPixels(__GLXclientState *cl, GLbyte *pc) GLboolean swapBytes, lsbFirst;
ClientPtr client = cl->client;
DrawablePtr pDraw;
- int error;
__GLXcontext *glxc;
int from_screen = 0;
int to_screen = 0;
@@ -939,12 +938,12 @@ int __glXDisp_ReadPixels(__GLXclientState *cl, GLbyte *pc) }
- Xfree( be_buf );
+ free( be_buf );
}
else {
/* Throw data on the floor */
_XEatData(dpy, be_buf_size);
- Xfree( buf );
+ free( buf );
return BadAlloc;
}
}
@@ -970,7 +969,7 @@ int __glXDisp_ReadPixels(__GLXclientState *cl, GLbyte *pc) WriteToClient(client, sizeof(xGLXReadPixelsReply),(char *)&reply);
if (buf_size > 0) {
WriteToClient(client, buf_size, (char *)buf);
- Xfree( buf );
+ free( buf );
}
return Success;
|