From acf87144d019f18e646501657d9082c6eba77f54 Mon Sep 17 00:00:00 2001
From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date: Sun, 26 Jun 2016 01:38:22 +0200
Subject: nx-X11/programs/Xserver: Drop {X,x}free() macros, use free() instead.

Fixes ArcticaProject/nx-libs#105
---
 nx-X11/programs/Xserver/record/record.c | 20 ++++++++++----------
 nx-X11/programs/Xserver/record/set.c    |  7 +++----
 2 files changed, 13 insertions(+), 14 deletions(-)

(limited to 'nx-X11/programs/Xserver/record')

diff --git a/nx-X11/programs/Xserver/record/record.c b/nx-X11/programs/Xserver/record/record.c
index 590a343a0..7fabf79c6 100644
--- a/nx-X11/programs/Xserver/record/record.c
+++ b/nx-X11/programs/Xserver/record/record.c
@@ -1126,7 +1126,7 @@ RecordUninstallHooks(pRCAP, oneclient)
 		{ /* nobody needs it, so free it */
 		    pClient->requestVector = pClientPriv->originalVector;
 		    pClient->devPrivates[RecordClientPrivateIndex].ptr = NULL;
-		    xfree(pClientPriv);
+		    free(pClientPriv);
 		}
 	    } /* end if this RCAP specifies any requests */
 	} /* end if not future clients */
@@ -1197,8 +1197,8 @@ RecordDeleteClientFromRCAP(pRCAP, position)
 	}
 	/* free the RCAP */
 	if (pRCAP->clientIDsSeparatelyAllocated)
-	    xfree(pRCAP->pClientIDs);
-	xfree(pRCAP);
+	    free(pRCAP->pClientIDs);
+	free(pRCAP);
     }
 } /* RecordDeleteClientFromRCAP */
 
@@ -1979,11 +1979,11 @@ bailout:
     {
 	for (i = 0; i < maxSets; i++)
 	    if (si[i].intervals)
-		xfree(si[i].intervals);
+		free(si[i].intervals);
 	DEALLOCATE_LOCAL(si);
     }
     if (pCanonClients && pCanonClients != (XID *)&stuff[1])
-	xfree(pCanonClients);
+	free(pCanonClients);
     return err;
 } /* RecordRegisterClients */
 
@@ -2068,7 +2068,7 @@ ProcRecordCreateContext(client)
     }
 bailout:
     if (pContext)
-	xfree(pContext);
+	free(pContext);
     return err;
 } /* ProcRecordCreateContext */
 
@@ -2119,7 +2119,7 @@ ProcRecordUnregisterClients(client)
 	RecordDeleteClientFromContext(pContext, pCanonClients[i]);
     }
     if (pCanonClients != (XID *)&stuff[1])
-	xfree(pCanonClients);
+	free(pCanonClients);
     return Success;
 } /* ProcRecordUnregisterClients */
 
@@ -2471,7 +2471,7 @@ ProcRecordGetContext(client)
 bailout:
     for (i = 0; i < nRCAPs; i++)
     {
-	if (pRangeInfo[i].pRanges) xfree(pRangeInfo[i].pRanges);
+	if (pRangeInfo[i].pRanges) free(pRangeInfo[i].pRanges);
     }
     DEALLOCATE_LOCAL(pRangeInfo);
     return err;
@@ -2646,7 +2646,7 @@ RecordDeleteContext(value, id)
 	}
     }
 
-    xfree(pContext);
+    free(pContext);
 
     /* remove context from AllContexts list */
 
@@ -2655,7 +2655,7 @@ RecordDeleteContext(value, id)
 	ppAllContexts[i] = ppAllContexts[numContexts - 1];
 	if (--numContexts == 0)
 	{
-	    xfree(ppAllContexts);
+	    free(ppAllContexts);
 	    ppAllContexts = NULL;
 	}
     }
diff --git a/nx-X11/programs/Xserver/record/set.c b/nx-X11/programs/Xserver/record/set.c
index 83fb0e7d7..28547f3d0 100644
--- a/nx-X11/programs/Xserver/record/set.c
+++ b/nx-X11/programs/Xserver/record/set.c
@@ -73,7 +73,6 @@ typedef int Bool;
 typedef unsigned short CARD16;
 
 #define xalloc malloc
-#define xfree free
 #define ALLOCATE_LOCAL malloc
 #define DEALLOCATE_LOCAL free
 
@@ -135,7 +134,7 @@ static void
 BitVectorDestroySet(pSet)
     RecordSetPtr pSet;
 {
-    xfree(pSet);
+    free(pSet);
 }
 
 static unsigned long
@@ -295,7 +294,7 @@ static void
 IntervalListDestroySet(pSet)
     RecordSetPtr pSet;
 {
-    xfree(pSet);
+    free(pSet);
 }
 
 static unsigned long
@@ -702,7 +701,7 @@ int main(argc, argv)
 
 	if (testcount & 1)
 	{
-	    xfree(bs);
+	    free(bs);
 	}
     }
 }
-- 
cgit v1.2.3