diff options
| author | Kristian Høgsberg <krh@redhat.com> | 2016-10-31 15:06:37 +0100 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-12-04 21:31:10 +0100 |
| commit | cee997dacb28aa9378b834b66a33c441145dceb7 (patch) | |
| tree | 1078c9fd4376594c3aae178808f5d99076d2932d /nx-X11/programs/Xserver/hw | |
| parent | b38d5b97dbd6c6b61c3ef0d046a4ba1c183a74f9 (diff) | |
| download | nx-libs-cee997dacb28aa9378b834b66a33c441145dceb7.tar.gz nx-libs-cee997dacb28aa9378b834b66a33c441145dceb7.tar.bz2 nx-libs-cee997dacb28aa9378b834b66a33c441145dceb7.zip | |
Drop glx_ansic.h wrapper and call malloc, realloc, free and str-funcs directly.
commit 2d2d38d17cc2558f8a41166a4a1578bc4c663c37
Author: Kristian Høgsberg <krh@redhat.com>
Date: Fri Mar 17 01:47:25 2006 +0000
Check for glproto when building GLX and make sure we have at least 1.4.6.
Drop glx_ansic.h wrapper and call xalloc, xrealloc, xfree and str-funcs
directly.
We don't check the glproto version as we know what it is (we have our own proto file).
Furthermore, we skip the switch from --glX<func> -> x<func> and directly switch to
<func> (e.g. __glXMalloc() -> malloc()).
Backported-to-NX-by: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
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) { |