diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-12-04 21:45:33 +0100 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-12-04 21:45:33 +0100 |
| commit | c893ad65ca612962e59697b0174c74afb89cbe78 (patch) | |
| tree | 90906f572923256f08220d6c6d34286832dfba40 /nx-X11/programs/Xserver/hw | |
| parent | b38d5b97dbd6c6b61c3ef0d046a4ba1c183a74f9 (diff) | |
| parent | 4e33fd4bef7c3254d53eb04a0d8f4312622f2092 (diff) | |
| download | nx-libs-c893ad65ca612962e59697b0174c74afb89cbe78.tar.gz nx-libs-c893ad65ca612962e59697b0174c74afb89cbe78.tar.bz2 nx-libs-c893ad65ca612962e59697b0174c74afb89cbe78.zip | |
Merge branch 'sunweaver-pr/drop-glx-ansic' into 3.6.x
Attributes GH PR #270: https://github.com/ArcticaProject/nx-libs/pull/270
Diffstat (limited to 'nx-X11/programs/Xserver/hw')
| -rw-r--r-- | nx-X11/programs/Xserver/hw/nxagent/NXglxext.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXglxext.c b/nx-X11/programs/Xserver/hw/nxagent/NXglxext.c index e30f69495..c09379c59 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/NXglxext.c +++ b/nx-X11/programs/Xserver/hw/nxagent/NXglxext.c @@ -67,12 +67,12 @@ static int __glXDispatch(ClientPtr client) opcode = stuff->glxCode; cl = __glXClients[client->index]; if (!cl) { - cl = (__GLXclientState *) __glXMalloc(sizeof(__GLXclientState)); + cl = (__GLXclientState *) malloc(sizeof(__GLXclientState)); __glXClients[client->index] = cl; if (!cl) { return BadAlloc; } - __glXMemset(cl, 0, sizeof(__GLXclientState)); + memset(cl, 0, sizeof(__GLXclientState)); } if (!cl->inUse) { @@ -145,12 +145,12 @@ static int __glXSwapDispatch(ClientPtr client) opcode = stuff->glxCode; cl = __glXClients[client->index]; if (!cl) { - cl = (__GLXclientState *) __glXMalloc(sizeof(__GLXclientState)); + cl = (__GLXclientState *) malloc(sizeof(__GLXclientState)); __glXClients[client->index] = cl; if (!cl) { return BadAlloc; } - __glXMemset(cl, 0, sizeof(__GLXclientState)); + memset(cl, 0, sizeof(__GLXclientState)); } if (!cl->inUse) { |