diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-07-02 14:11:38 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-07-02 14:11:38 +0200 |
| commit | 1dbd3c888a3eee51db5303bd93e95b84999f5d31 (patch) | |
| tree | 84db92271726b42b8c0864c8b7c77b2330566fc1 /nx-X11/programs/Xserver/hw/nxagent/Cursor.c | |
| parent | 279d37127db241a9ee685f6b671f51aa21a972ea (diff) | |
| parent | e85808245810d0cc6918104deef25213d5f9e06c (diff) | |
| download | nx-libs-1dbd3c888a3eee51db5303bd93e95b84999f5d31.tar.gz nx-libs-1dbd3c888a3eee51db5303bd93e95b84999f5d31.tar.bz2 nx-libs-1dbd3c888a3eee51db5303bd93e95b84999f5d31.zip | |
Merge branch 'sunweaver-pr/backport-Xorg-memory-handling' into 3.6.x
Attributes GH PR #159: https://github.com/ArcticaProject/nx-libs/pull/159
Reviewed by: Vadim Troshchinskiy <vadim@qindel.com> -- Fri, 01 Jul 2016 12:47:46 -0700
Diffstat (limited to 'nx-X11/programs/Xserver/hw/nxagent/Cursor.c')
| -rw-r--r-- | nx-X11/programs/Xserver/hw/nxagent/Cursor.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Cursor.c b/nx-X11/programs/Xserver/hw/nxagent/Cursor.c index 62095d5b3..932f7495f 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Cursor.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Cursor.c @@ -231,7 +231,7 @@ Bool nxagentRealizeCursor(ScreenPtr pScreen, CursorPtr pCursor) bg_color.green = pCursor->backGreen; bg_color.blue = pCursor->backBlue; - pCursor->devPriv[pScreen->myNum] = (void *) xalloc(sizeof(nxagentPrivCursor)); + pCursor->devPriv[pScreen->myNum] = (void *) malloc(sizeof(nxagentPrivCursor)); nxagentCursorPriv(pCursor, pScreen)->cursor = XCreatePixmapCursor(nxagentDisplay, source, mask, &fg_color, @@ -267,7 +267,7 @@ Bool nxagentUnrealizeCursor(ScreenPtr pScreen, CursorPtr pCursor) nxagentCursor(pCursor, pScreen) = None; } - xfree(nxagentCursorPriv(pCursor, pScreen)); + free(nxagentCursorPriv(pCursor, pScreen)); return True; } @@ -366,7 +366,7 @@ void nxagentReconnectCursor(void * p0, XID x1, void * p2) } else { - xfree(nxagentCursorPriv(pCursor, nxagentDefaultScreen)); + free(nxagentCursorPriv(pCursor, nxagentDefaultScreen)); if (!nxagentRealizeCursor(nxagentDefaultScreen, pCursor)) { fprintf(stderr, "nxagentReconnectCursor: nxagentRealizeCursor failed\n"); |