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/Xext/sleepuntil.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/Xext/sleepuntil.c')
| -rw-r--r-- | nx-X11/programs/Xserver/Xext/sleepuntil.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/nx-X11/programs/Xserver/Xext/sleepuntil.c b/nx-X11/programs/Xserver/Xext/sleepuntil.c index 62f946cf8..93d75a862 100644 --- a/nx-X11/programs/Xserver/Xext/sleepuntil.c +++ b/nx-X11/programs/Xserver/Xext/sleepuntil.c @@ -98,7 +98,7 @@ ClientSleepUntil (client, revive, notifyFunc, closure) SertafiedGeneration = serverGeneration; BlockHandlerRegistered = FALSE; } - pRequest = (SertafiedPtr) xalloc (sizeof (SertafiedRec)); + pRequest = (SertafiedPtr) malloc (sizeof (SertafiedRec)); if (!pRequest) return FALSE; pRequest->pClient = client; @@ -111,7 +111,7 @@ ClientSleepUntil (client, revive, notifyFunc, closure) SertafiedWakeupHandler, (void *) 0)) { - xfree (pRequest); + free (pRequest); return FALSE; } BlockHandlerRegistered = TRUE; @@ -169,7 +169,7 @@ SertafiedDelete (value, id) } if (pRequest->notifyFunc) (*pRequest->notifyFunc) (pRequest->pClient, pRequest->closure); - xfree (pRequest); + free (pRequest); return TRUE; } |