nx-X11/programs/Xserver: Drop {X,x}free() macros, use free() instead.

Fixes ArcticaProject/nx-libs#105

5 files changed, 19 insertions, 19 deletions

diff --git a/nx-X11/programs/Xserver/fb/fbcmap.c b/nx-X11/programs/Xserver/fb/fbcmap.c
index a7c8ca638..9fdffdeff 100644
--- a/nx-X11/programs/Xserver/fb/fbcmap.c
+++ b/nx-X11/programs/Xserver/fb/fbcmap.c
@@ -491,8 +491,8 @@ fbInitVisuals (VisualPtr    *visualp,
     visual = (VisualPtr) xalloc (nvisual * sizeof (VisualRec));
     if (!depth || !visual)
     {
-	xfree (depth);
-	xfree (visual);
+	free (depth);
+	free (visual);
 	return FALSE;
     }
     *depthp = depth;
@@ -549,7 +549,7 @@ fbInitVisuals (VisualPtr    *visualp,
 	    vid++;
 	    visual++;
 	}
-	xfree (visuals);
+	free (visuals);
     }
     fbVisuals = NULL;
     visual = *visualp;
diff --git a/nx-X11/programs/Xserver/fb/fbcopy.c b/nx-X11/programs/Xserver/fb/fbcopy.c
index f68811ebb..d1fb63828 100644
--- a/nx-X11/programs/Xserver/fb/fbcopy.c
+++ b/nx-X11/programs/Xserver/fb/fbcopy.c
@@ -282,7 +282,7 @@ fbCopyNto1 (DrawablePtr	pSrcDrawable,
     
 		      pPriv->and, pPriv->xor,
 		      pPriv->bgand, pPriv->bgxor);
-	    xfree (tmp);
+	    free (tmp);
 	}
 	pbox++;
     }
diff --git a/nx-X11/programs/Xserver/fb/fbpixmap.c b/nx-X11/programs/Xserver/fb/fbpixmap.c
index 99c03862b..c562da221 100644
--- a/nx-X11/programs/Xserver/fb/fbpixmap.c
+++ b/nx-X11/programs/Xserver/fb/fbpixmap.c
@@ -104,7 +104,7 @@ fbDestroyPixmap (PixmapPtr pPixmap)
 {
     if(--pPixmap->refcnt)
 	return TRUE;
-    xfree(pPixmap);
+    free(pPixmap);
     return TRUE;
 }
 
@@ -309,7 +309,7 @@ fbPixmapToRegion(PixmapPtr pPix)
 	pReg->extents.y2 = RegionEnd(pReg)->y2;
 	if (pReg->data->numRects == 1)
 	{
-	    xfree(pReg->data);
+	    free(pReg->data);
 	    pReg->data = (RegDataPtr)NULL;
 	}
     }
diff --git a/nx-X11/programs/Xserver/fb/fbpseudocolor.c b/nx-X11/programs/Xserver/fb/fbpseudocolor.c
index 51f21ed21..bc1c091ed 100644
--- a/nx-X11/programs/Xserver/fb/fbpseudocolor.c
+++ b/nx-X11/programs/Xserver/fb/fbpseudocolor.c
@@ -277,7 +277,7 @@ xxCreateScreenResources(ScreenPtr pScreen)
     
     pPixmap = (*pScreen->CreatePixmap)(pScreen, 0, 0, depth);
     if (!pPixmap) {
-	xfree(pBits);
+	free(pBits);
 	return FALSE;
     }
     if (!(*pScreen->ModifyPixmapHeader)(pPixmap, pScreen->width,
@@ -285,7 +285,7 @@ xxCreateScreenResources(ScreenPtr pScreen)
 					BitsPerPixel(depth),
 					PixmapBytePad(pScreen->width, depth),
 					pBits)) {
-	xfree(pBits);
+	free(pBits);
 	return FALSE;
     }
     if (pScreen->rootDepth == pScrPriv->myDepth) {
@@ -295,7 +295,7 @@ xxCreateScreenResources(ScreenPtr pScreen)
 					    PixmapBytePad(pScreen->width,
 							  pScrPriv->depth),
 					    0)) {
-	    xfree(pBits);
+	    free(pBits);
 	    return FALSE;
 	}
     }
@@ -328,9 +328,9 @@ xxCloseScreen (int iScreen, ScreenPtr pScreen)
     unwrap (pScrPriv,pScreen, CloseScreen);
     ret = pScreen->CloseScreen(iScreen,pScreen);
 
-    xfree(pScrPriv->pBits);
-    xfree(pScrPriv->InstalledCmaps);
-    xfree(pScrPriv);
+    free(pScrPriv->pBits);
+    free(pScrPriv->InstalledCmaps);
+    free(pScrPriv);
     
     return TRUE;
 }
@@ -456,8 +456,8 @@ xxDestroyColormap(ColormapPtr pmap)
 	    tmpCmapPriv = tmpCmapPriv->next;
 	}
 	
-	xfree(pCmapPriv->cmap);
-	xfree(pCmapPriv);
+	free(pCmapPriv->cmap);
+	free(pCmapPriv);
     }
 
     unwrap(pScrPriv,pmap->pScreen, DestroyColormap);
diff --git a/nx-X11/programs/Xserver/fb/fbscreen.c b/nx-X11/programs/Xserver/fb/fbscreen.c
index 342fd5784..0600cebfe 100644
--- a/nx-X11/programs/Xserver/fb/fbscreen.c
+++ b/nx-X11/programs/Xserver/fb/fbscreen.c
@@ -36,12 +36,12 @@ fbCloseScreen (int index, ScreenPtr pScreen)
     DepthPtr	depths = pScreen->allowedDepths;
 
     for (d = 0; d < pScreen->numDepths; d++)
-	xfree (depths[d].vids);
-    xfree (depths);
-    xfree (pScreen->visuals);
-    xfree (pScreen->devPrivate);
+	free (depths[d].vids);
+    free (depths);
+    free (pScreen->visuals);
+    free (pScreen->devPrivate);
 #ifdef FB_SCREEN_PRIVATE
-    xfree (pScreen->devPrivates[fbScreenPrivateIndex].ptr);
+    free (pScreen->devPrivates[fbScreenPrivateIndex].ptr);
 #endif
     return TRUE;
 }