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/GL/glx/glxpix.c | |
| 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/GL/glx/glxpix.c')
| -rw-r--r-- | nx-X11/programs/Xserver/GL/glx/glxpix.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nx-X11/programs/Xserver/GL/glx/glxpix.c b/nx-X11/programs/Xserver/GL/glx/glxpix.c index e1628efc0..81e29a9c5 100644 --- a/nx-X11/programs/Xserver/GL/glx/glxpix.c +++ b/nx-X11/programs/Xserver/GL/glx/glxpix.c @@ -95,7 +95,7 @@ Free(__GLdrawableBuffer *buf, __GLdrawablePrivate *glPriv) FreeScratchGC(bufferInfo->pGC); } - __glXFree(bufferInfo); + free(bufferInfo); buf->other = NULL; } @@ -123,7 +123,7 @@ __glXInitPix(__GLdrawableBuffer *buf, __GLdrawablePrivate *glPriv, buf->free = Free; /* allocate local information */ - bufferInfo = (__GLPixBufferInfo *) __glXMalloc(sizeof(__GLPixBufferInfo)); + bufferInfo = (__GLPixBufferInfo *) malloc(sizeof(__GLPixBufferInfo)); buf->other = (void *) bufferInfo; bufferInfo->pGC = CreateScratchGC(pGlxPixmap->pDraw->pScreen, |