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

Fixes ArcticaProject/nx-libs#105

12 files changed, 90 insertions, 90 deletions

diff --git a/nx-X11/programs/Xserver/randr/randr.c b/nx-X11/programs/Xserver/randr/randr.c
index b78a947c8..afce35d7d 100644
--- a/nx-X11/programs/Xserver/randr/randr.c
+++ b/nx-X11/programs/Xserver/randr/randr.c
@@ -131,9 +131,9 @@ RRCloseScreen(
 
     RRMonitorClose(pScreen);
 
-    xfree(pScrPriv->crtcs);
-    xfree(pScrPriv->outputs);
-    xfree(pScrPriv);
+    free(pScrPriv->crtcs);
+    free(pScrPriv->outputs);
+    free(pScrPriv);
     RRNScreens -= 1;            /* ok, one fewer screen with RandR running */
     return (*pScreen->CloseScreen) (i, pScreen);
 }
@@ -405,7 +405,7 @@ RRFreeClient(void *data, XID id)
                 *pHead = pRREvent->next;
         }
     }
-    xfree((void *) pRREvent);
+    free((void *) pRREvent);
     return 1;
 }
 
@@ -418,9 +418,9 @@ RRFreeEvents(void *data, XID id)
     for (pCur = *pHead; pCur; pCur = pNext) {
         pNext = pCur->next;
         FreeResource(pCur->clientResource, RRClientType);
-        xfree((void *) pCur);
+        free((void *) pCur);
     }
-    xfree((void *) pHead);
+    free((void *) pHead);
     return 1;
 }
 
diff --git a/nx-X11/programs/Xserver/randr/rrcrtc.c b/nx-X11/programs/Xserver/randr/rrcrtc.c
index d69b5ec08..6fb6e02e6 100644
--- a/nx-X11/programs/Xserver/randr/rrcrtc.c
+++ b/nx-X11/programs/Xserver/randr/rrcrtc.c
@@ -215,7 +215,7 @@ RRCrtcNotify(RRCrtcPtr crtc,
                 return FALSE;
         }
         else {
-            xfree(crtc->outputs);
+            free(crtc->outputs);
             newoutputs = NULL;
         }
         crtc->outputs = newoutputs;
@@ -391,7 +391,7 @@ RRComputeContiguity(ScreenPtr pScreen)
     discontiguous = FALSE;
 
  out:
-    xfree(reachable);
+    free(reachable);
     pScrPriv->discontiguous = discontiguous;
 }
 
@@ -778,10 +778,10 @@ RRCrtcDestroyResource(void *value, XID pid)
 
     if (crtc->scanout_pixmap)
         RRCrtcDetachScanoutPixmap(crtc);
-    xfree(crtc->gammaRed);
+    free(crtc->gammaRed);
     if (crtc->mode)
         RRModeDestroy(crtc->mode);
-    xfree(crtc);
+    free(crtc);
     return 1;
 }
 
@@ -899,7 +899,7 @@ RRCrtcGammaSetSize(RRCrtcPtr crtc, int size)
     }
     else
         gamma = NULL;
-    xfree(crtc->gammaRed);
+    free(crtc->gammaRed);
     crtc->gammaRed = gamma;
     crtc->gammaGreen = gamma + size;
     crtc->gammaBlue = gamma + size * 2;
@@ -1089,7 +1089,7 @@ ProcRRGetCrtcInfo(ClientPtr client)
     WriteToClient(client, sizeof(xRRGetCrtcInfoReply), (char *) &rep);
     if (extraLen) {
         WriteToClient(client, extraLen, (char *) extra);
-        xfree(extra);
+        free(extra);
     }
 
     return Success;
@@ -1151,7 +1151,7 @@ ProcRRSetCrtcConfig(ClientPtr client)
                                       RROutputType, client, DixSetAttrAccess);
 
         if (ret != Success) {
-            xfree(outputs);
+            free(outputs);
             return ret;
         }
 #else                           /* !defined(NXAGENT_SERVER) */
@@ -1159,7 +1159,7 @@ ProcRRSetCrtcConfig(ClientPtr client)
         if (!outputs[i]) {
             client->errorValue = outputIds[i];
             if (outputs)
-                xfree(outputs);
+                free(outputs);
             return RRErrorBase + BadRROutput;
         }
 #endif                          /* !defined(NXAGENT_SERVER) */
@@ -1168,7 +1168,7 @@ ProcRRSetCrtcConfig(ClientPtr client)
             if (outputs[i]->crtcs[j] == crtc)
                 break;
         if (j == outputs[i]->numCrtcs) {
-            xfree(outputs);
+            free(outputs);
             return BadMatch;
         }
         /* validate mode for this output */
@@ -1180,7 +1180,7 @@ ProcRRSetCrtcConfig(ClientPtr client)
                 break;
         }
         if (j == outputs[i]->numModes + outputs[i]->numUserModes) {
-            xfree(outputs);
+            free(outputs);
             return BadMatch;
         }
     }
@@ -1196,7 +1196,7 @@ ProcRRSetCrtcConfig(ClientPtr client)
                     break;
             }
             if (k == outputs[i]->numClones) {
-                xfree(outputs);
+                free(outputs);
                 return BadMatch;
             }
         }
@@ -1230,7 +1230,7 @@ ProcRRSetCrtcConfig(ClientPtr client)
          * Invalid rotation
          */
         client->errorValue = stuff->rotation;
-        xfree(outputs);
+        free(outputs);
         return BadValue;
     }
 
@@ -1240,7 +1240,7 @@ ProcRRSetCrtcConfig(ClientPtr client)
              * requested rotation or reflection not supported by screen
              */
             client->errorValue = stuff->rotation;
-            xfree(outputs);
+            free(outputs);
             return BadMatch;
         }
 
@@ -1282,13 +1282,13 @@ ProcRRSetCrtcConfig(ClientPtr client)
                                  &source_height);
             if (stuff->x + source_width > width) {
                 client->errorValue = stuff->x;
-                xfree(outputs);
+                free(outputs);
                 return BadValue;
             }
 
             if (stuff->y + source_height > height) {
                 client->errorValue = stuff->y;
-                xfree(outputs);
+                free(outputs);
                 return BadValue;
             }
         }
@@ -1304,7 +1304,7 @@ ProcRRSetCrtcConfig(ClientPtr client)
     pScrPriv->lastSetTime = time;
 
  sendReply:
-    xfree(outputs);
+    free(outputs);
 
     rep = (xRRSetCrtcConfigReply) {
         .type = X_Reply,
@@ -1535,7 +1535,7 @@ ProcRRGetCrtcGamma(ClientPtr client)
         memcpy(extra, crtc->gammaRed, len);
         client->pSwapReplyFunc = (ReplySwapPtr) CopySwap16Write;
         WriteSwappedDataToClient(client, len, extra);
-        xfree(extra);
+        free(extra);
     }
     return Success;
 }
@@ -1700,7 +1700,7 @@ ProcRRGetCrtcTransform(ClientPtr client)
     }
     WriteToClient(client, sizeof(xRRGetCrtcTransformReply) + nextra,
                   (char *) reply);
-    xfree(reply);
+    free(reply);
     return Success;
 }
 
@@ -1894,7 +1894,7 @@ RRReplaceScanoutPixmap(DrawablePtr pDrawable, PixmapPtr pPixmap, Bool enable)
         else
             crtc->scanout_pixmap = saved_scanout_pixmap[i];
     }
-    xfree(saved_scanout_pixmap);
+    free(saved_scanout_pixmap);
 
     return ret;
 }
diff --git a/nx-X11/programs/Xserver/randr/rrdispatch.c b/nx-X11/programs/Xserver/randr/rrdispatch.c
index b15d1ad20..271d5d939 100644
--- a/nx-X11/programs/Xserver/randr/rrdispatch.c
+++ b/nx-X11/programs/Xserver/randr/rrdispatch.c
@@ -212,7 +212,7 @@ ProcRRSelectInput(ClientPtr client)
                     pNewRREvent->next = pRREvent->next;
                 else
                     *pHead = pRREvent->next;
-                xfree(pRREvent);
+                free(pRREvent);
             }
         }
     }
diff --git a/nx-X11/programs/Xserver/randr/rrinfo.c b/nx-X11/programs/Xserver/randr/rrinfo.c
index df9b79986..4c47fb903 100644
--- a/nx-X11/programs/Xserver/randr/rrinfo.c
+++ b/nx-X11/programs/Xserver/randr/rrinfo.c
@@ -132,7 +132,7 @@ RRScanOldConfig(ScreenPtr pScreen, Rotation rotations)
                     newMode = mode;
                 }
             }
-            xfree(size->pRates);
+            free(size->pRates);
         }
         else {
             mode = RROldModeAdd(output, size, 0);
@@ -141,7 +141,7 @@ RRScanOldConfig(ScreenPtr pScreen, Rotation rotations)
         }
     }
     if (pScrPriv->nSizes)
-        xfree(pScrPriv->pSizes);
+        free(pScrPriv->pSizes);
     pScrPriv->pSizes = NULL;
     pScrPriv->nSizes = 0;
 
diff --git a/nx-X11/programs/Xserver/randr/rrmode.c b/nx-X11/programs/Xserver/randr/rrmode.c
index 918e0f221..3d84a0516 100644
--- a/nx-X11/programs/Xserver/randr/rrmode.c
+++ b/nx-X11/programs/Xserver/randr/rrmode.c
@@ -106,13 +106,13 @@ RRModeCreate(xRRModeInfo * modeInfo, const char *name, ScreenPtr userScreen)
         newModes = xalloc(sizeof(RRModePtr));
 
     if (!newModes) {
-        xfree(mode);
+        free(mode);
         return NULL;
     }
 
     mode->mode.id = FakeClientID(0);
     if (!AddResource(mode->mode.id, RRModeType, (void *) mode)) {
-        xfree(newModes);
+        free(newModes);
         return NULL;
     }
     modes = newModes;
@@ -285,14 +285,14 @@ RRModeDestroy(RRModePtr mode)
                     (num_modes - m - 1) * sizeof(RRModePtr));
             num_modes--;
             if (!num_modes) {
-                xfree(modes);
+                free(modes);
                 modes = NULL;
             }
             break;
         }
     }
 
-    xfree(mode);
+    free(mode);
 }
 
 static int
diff --git a/nx-X11/programs/Xserver/randr/rrmonitor.c b/nx-X11/programs/Xserver/randr/rrmonitor.c
index fc9b9295b..36543cb4c 100644
--- a/nx-X11/programs/Xserver/randr/rrmonitor.c
+++ b/nx-X11/programs/Xserver/randr/rrmonitor.c
@@ -298,7 +298,7 @@ RRMonitorInitList(ScreenPtr screen, RRMonitorListPtr mon_list, Bool get_active)
 static void
 RRMonitorFiniList(RRMonitorListPtr list)
 {
-    xfree(list->server_crtc);
+    free(list->server_crtc);
 }
 
 /* Construct a complete list of protocol-visible monitors, including
@@ -401,7 +401,7 @@ RRMonitorCountList(ScreenPtr screen)
 void
 RRMonitorFree(RRMonitorPtr monitor)
 {
-    xfree(monitor);
+    free(monitor);
 }
 
 RRMonitorPtr
@@ -573,8 +573,8 @@ RRMonitorFreeList(RRMonitorPtr monitors, int nmon)
     int m;
 
     for (m = 0; m < nmon; m++)
-        xfree(monitors[m].outputs);
-    xfree(monitors);
+        free(monitors[m].outputs);
+    free(monitors);
 }
 
 void
@@ -600,7 +600,7 @@ RRMonitorClose(ScreenPtr screen)
 
     for (m = 0; m < pScrPriv->numMonitors; m++)
         RRMonitorFree(pScrPriv->monitors[m]);
-    xfree(pScrPriv->monitors);
+    free(pScrPriv->monitors);
     pScrPriv->monitors = NULL;
     pScrPriv->numMonitors = 0;
 }
diff --git a/nx-X11/programs/Xserver/randr/rroutput.c b/nx-X11/programs/Xserver/randr/rroutput.c
index 2628fabb0..46948c577 100644
--- a/nx-X11/programs/Xserver/randr/rroutput.c
+++ b/nx-X11/programs/Xserver/randr/rroutput.c
@@ -154,7 +154,7 @@ RROutputSetClones(RROutputPtr output, RROutputPtr * clones, int numClones)
     }
     else
         newClones = NULL;
-    xfree(output->clones);
+    free(output->clones);
     memcpy(newClones, clones, numClones * sizeof(RROutputPtr));
     output->clones = newClones;
     output->numClones = numClones;
@@ -194,7 +194,7 @@ RROutputSetModes(RROutputPtr output,
     if (output->modes) {
         for (i = 0; i < output->numModes; i++)
             RRModeDestroy(output->modes[i]);
-        xfree(output->modes);
+        free(output->modes);
     }
     memcpy(newModes, modes, numModes * sizeof(RRModePtr));
     output->modes = newModes;
@@ -299,7 +299,7 @@ RROutputSetCrtcs(RROutputPtr output, RRCrtcPtr * crtcs, int numCrtcs)
     }
     else
         newCrtcs = NULL;
-    xfree(output->crtcs);
+    free(output->crtcs);
     memcpy(newCrtcs, crtcs, numCrtcs * sizeof(RRCrtcPtr));
     output->crtcs = newCrtcs;
     output->numCrtcs = numCrtcs;
@@ -404,17 +404,17 @@ RROutputDestroyResource(void *value, XID pid)
     if (output->modes) {
         for (m = 0; m < output->numModes; m++)
             RRModeDestroy(output->modes[m]);
-        xfree(output->modes);
+        free(output->modes);
     }
 
     for (m = 0; m < output->numUserModes; m++)
         RRModeDestroy(output->userModes[m]);
-    xfree(output->userModes);
+    free(output->userModes);
 
-    xfree(output->crtcs);
-    xfree(output->clones);
+    free(output->crtcs);
+    free(output->clones);
     RRDeleteAllOutputProperties(output);
-    xfree(output);
+    free(output);
     return 1;
 }
 
@@ -541,7 +541,7 @@ ProcRRGetOutputInfo(ClientPtr client)
     WriteToClient(client, sizeof(xRRGetOutputInfoReply), (char *) &rep);
     if (extraLen) {
         WriteToClient(client, extraLen, (char *) extra);
-        xfree(extra);
+        free(extra);
     }
 
     return Success;
diff --git a/nx-X11/programs/Xserver/randr/rrproperty.c b/nx-X11/programs/Xserver/randr/rrproperty.c
index 741d0310e..7275cd34f 100644
--- a/nx-X11/programs/Xserver/randr/rrproperty.c
+++ b/nx-X11/programs/Xserver/randr/rrproperty.c
@@ -63,10 +63,10 @@ RRDeliverPropertyEvent(ScreenPtr pScreen, xEvent *event)
 static void
 RRDestroyOutputProperty(RRPropertyPtr prop)
 {
-    xfree(prop->valid_values);
-    xfree(prop->current.data);
-    xfree(prop->pending.data);
-    xfree(prop);
+    free(prop->valid_values);
+    free(prop->current.data);
+    free(prop->pending.data);
+    free(prop);
 }
 
 static void
@@ -225,12 +225,12 @@ RRChangeOutputProperty(RROutputPtr output, Atom property, Atom type,
         if (pending && pScrPriv->rrOutputSetProperty &&
             !pScrPriv->rrOutputSetProperty(output->pScreen, output,
                                            prop->propertyName, &new_value)) {
-            xfree(new_value.data);
+            free(new_value.data);
             if (add)
                 RRDestroyOutputProperty(prop);
             return BadValue;
         }
-        xfree(prop_value->data);
+        free(prop_value->data);
         *prop_value = new_value;
     }
 
@@ -377,7 +377,7 @@ RRConfigureOutputProperty(RROutputPtr output, Atom property,
      * loses any pending values
      */
     if (prop->is_pending && !pending) {
-        xfree(prop->pending.data);
+        free(prop->pending.data);
         RRInitOutputPropertyValue(&prop->pending);
     }
 
@@ -385,7 +385,7 @@ RRConfigureOutputProperty(RROutputPtr output, Atom property,
     prop->range = range;
     prop->immutable = immutable;
     prop->num_valid = num_values;
-    xfree(prop->valid_values);
+    free(prop->valid_values);
     prop->valid_values = new_values;
 
     if (add) {
@@ -442,7 +442,7 @@ ProcRRListOutputProperties(ClientPtr client)
 
         client->pSwapReplyFunc = (ReplySwapPtr) Swap32Write;
         WriteSwappedDataToClient(client, numProps * sizeof(Atom), pAtoms);
-        xfree(pAtoms);
+        free(pAtoms);
     }
     return Success;
 }
@@ -493,7 +493,7 @@ ProcRRQueryOutputProperty(ClientPtr client)
         client->pSwapReplyFunc = (ReplySwapPtr) Swap32Write;
         WriteSwappedDataToClient(client, prop->num_valid * sizeof(INT32),
                                  extra);
-        xfree(extra);
+        free(extra);
     }
     return Success;
 }
@@ -749,7 +749,7 @@ ProcRRGetOutputProperty(ClientPtr client)
             break;
         }
         WriteSwappedDataToClient(client, len, extra);
-        xfree(extra);
+        free(extra);
     }
 
     if (stuff->delete && (reply.bytesAfter == 0)) {     /* delete the Property */
diff --git a/nx-X11/programs/Xserver/randr/rrprovider.c b/nx-X11/programs/Xserver/randr/rrprovider.c
index b2251b682..4911f8fd8 100644
--- a/nx-X11/programs/Xserver/randr/rrprovider.c
+++ b/nx-X11/programs/Xserver/randr/rrprovider.c
@@ -152,7 +152,7 @@ ProcRRGetProviders(ClientPtr client)
     if (extraLen)
     {
         WriteToClient(client, extraLen, (char *) extra);
-        xfree(extra);
+        free(extra);
     }
     return Success;
 }
@@ -295,7 +295,7 @@ ProcRRGetProviderInfo(ClientPtr client)
     if (extraLen)
     {
         WriteToClient(client, extraLen, (char *) extra);
-        xfree(extra);
+        free(extra);
     }
     return Success;
 }
@@ -427,7 +427,7 @@ RRProviderDestroyResource(void *value, XID pid)
             (*pScrPriv->rrProviderDestroy) (pScreen, provider);
         pScrPriv->provider = NULL;
     }
-    xfree(provider);
+    free(provider);
     return 1;
 }
 
diff --git a/nx-X11/programs/Xserver/randr/rrproviderproperty.c b/nx-X11/programs/Xserver/randr/rrproviderproperty.c
index a68a94ff2..9aa2135df 100644
--- a/nx-X11/programs/Xserver/randr/rrproviderproperty.c
+++ b/nx-X11/programs/Xserver/randr/rrproviderproperty.c
@@ -60,10 +60,10 @@ RRDeliverPropertyEvent(ScreenPtr pScreen, xEvent *event)
 static void
 RRDestroyProviderProperty(RRPropertyPtr prop)
 {
-    xfree(prop->valid_values);
-    xfree(prop->current.data);
-    xfree(prop->pending.data);
-    xfree(prop);
+    free(prop->valid_values);
+    free(prop->current.data);
+    free(prop->pending.data);
+    free(prop);
 }
 
 static void
@@ -222,10 +222,10 @@ RRChangeProviderProperty(RRProviderPtr provider, Atom property, Atom type,
                                              prop->propertyName, &new_value)) {
             if (add)
                 RRDestroyProviderProperty(prop);
-            xfree(new_value.data);
+            free(new_value.data);
             return BadValue;
         }
-        xfree(prop_value->data);
+        free(prop_value->data);
         *prop_value = new_value;
     }
 
@@ -373,7 +373,7 @@ RRConfigureProviderProperty(RRProviderPtr provider, Atom property,
      * loses any pending values
      */
     if (prop->is_pending && !pending) {
-        xfree(prop->pending.data);
+        free(prop->pending.data);
         RRInitProviderPropertyValue(&prop->pending);
     }
 
@@ -381,7 +381,7 @@ RRConfigureProviderProperty(RRProviderPtr provider, Atom property,
     prop->range = range;
     prop->immutable = immutable;
     prop->num_valid = num_values;
-    xfree(prop->valid_values);
+    free(prop->valid_values);
     prop->valid_values = new_values;
 
     if (add) {
@@ -437,7 +437,7 @@ ProcRRListProviderProperties(ClientPtr client)
     if (numProps) {
         client->pSwapReplyFunc = (ReplySwapPtr) Swap32Write;
         WriteSwappedDataToClient(client, numProps * sizeof(Atom), pAtoms);
-        xfree(pAtoms);
+        free(pAtoms);
     }
     return Success;
 }
@@ -487,7 +487,7 @@ ProcRRQueryProviderProperty(ClientPtr client)
         client->pSwapReplyFunc = (ReplySwapPtr) Swap32Write;
         WriteSwappedDataToClient(client, prop->num_valid * sizeof(INT32),
                                  extra);
-        xfree(extra);
+        free(extra);
     }
     return Success;
 }
@@ -741,7 +741,7 @@ ProcRRGetProviderProperty(ClientPtr client)
             break;
         }
         WriteSwappedDataToClient(client, len, extra);
-        xfree(extra);
+        free(extra);
     }
 
     if (stuff->delete && (reply.bytesAfter == 0)) {     /* delete the Property */
diff --git a/nx-X11/programs/Xserver/randr/rrscreen.c b/nx-X11/programs/Xserver/randr/rrscreen.c
index af54d66f5..7047d80a5 100644
--- a/nx-X11/programs/Xserver/randr/rrscreen.c
+++ b/nx-X11/programs/Xserver/randr/rrscreen.c
@@ -334,7 +334,7 @@ ProcRRSetScreenSize(ClientPtr client)
     for (j = 0; j < num_modes; j++)                   \
         total_name_len += modes[j]->mode.nameLength;  \
     total_modes += num_modes;                         \
-    xfree(modes);                                      \
+    free(modes);                                      \
 } while(0)
 
 static inline void
@@ -388,7 +388,7 @@ swap_modeinfos(xRRModeInfo * modeinfos, int i)
             names += mode->mode.nameLength;                \
             mode_count++;                                  \
         }                                                  \
-        xfree(modes);                                       \
+        free(modes);                                       \
     }                                                      \
     } while (0)
 
@@ -504,7 +504,7 @@ rrGetMultiScreenResources(ClientPtr client, Bool query, ScreenPtr pScreen)
     WriteToClient(client, sizeof(xRRGetScreenResourcesReply), (char *) &rep);
     if (extraLen) {
         WriteToClient(client, extraLen, (char *) extra);
-        xfree(extra);
+        free(extra);
     }
     return Success;
 }
@@ -597,7 +597,7 @@ rrGetScreenResources(ClientPtr client, Bool query)
         if (extraLen) {
             extra = xalloc(extraLen);
             if (!extra) {
-                xfree(modes);
+                free(modes);
                 return BadAlloc;
             }
         }
@@ -655,7 +655,7 @@ rrGetScreenResources(ClientPtr client, Bool query)
             memcpy(names, mode->name, mode->mode.nameLength);
             names += mode->mode.nameLength;
         }
-        xfree(modes);
+        free(modes);
         assert(bytes_to_int32((char *) names - (char *) extra) == rep.length);
     }
 
@@ -673,7 +673,7 @@ rrGetScreenResources(ClientPtr client, Bool query)
                   (char *) (char *) &rep);
     if (extraLen) {
         WriteToClient(client, extraLen, (char *) (char *) extra);
-        xfree(extra);
+        free(extra);
     }
     return Success;
 }
@@ -876,7 +876,7 @@ ProcRRGetScreenInfo(ClientPtr client)
         if (extraLen) {
             extra = (CARD8 *) xalloc(extraLen);
             if (!extra) {
-                xfree(pData);
+                free(pData);
                 return BadAlloc;
             }
         }
@@ -916,7 +916,7 @@ ProcRRGetScreenInfo(ClientPtr client)
                 }
             }
         }
-        xfree(pData);
+        free(pData);
 
         data8 = (CARD8 *) rates;
 
@@ -939,7 +939,7 @@ ProcRRGetScreenInfo(ClientPtr client)
     WriteToClient(client, sizeof(xRRGetScreenInfoReply), (char *) &rep);
     if (extraLen) {
         WriteToClient(client, extraLen, (char *) extra);
-        xfree(extra);
+        free(extra);
     }
     return Success;
 }
@@ -1035,7 +1035,7 @@ ProcRRSetScreenConfig(ClientPtr client)
          * Invalid size ID
          */
         client->errorValue = stuff->sizeID;
-        xfree(pData);
+        free(pData);
         return BadValue;
     }
     pSize = &pData->sizes[stuff->sizeID];
@@ -1057,7 +1057,7 @@ ProcRRSetScreenConfig(ClientPtr client)
          * Invalid rotation
          */
         client->errorValue = stuff->rotation;
-        xfree(pData);
+        free(pData);
         return BadValue;
     }
 
@@ -1066,7 +1066,7 @@ ProcRRSetScreenConfig(ClientPtr client)
          * requested rotation or reflection not supported by screen
          */
         client->errorValue = stuff->rotation;
-        xfree(pData);
+        free(pData);
         return BadMatch;
     }
 
@@ -1088,7 +1088,7 @@ ProcRRSetScreenConfig(ClientPtr client)
              * Invalid rate
              */
             client->errorValue = rate;
-            xfree(pData);
+            free(pData);
             return BadValue;
         }
         mode = pSize->pRates[i].mode;
@@ -1113,12 +1113,12 @@ ProcRRSetScreenConfig(ClientPtr client)
     height = mode->mode.height;
     if (width < pScrPriv->minWidth || pScrPriv->maxWidth < width) {
         client->errorValue = width;
-        xfree(pData);
+        free(pData);
         return BadValue;
     }
     if (height < pScrPriv->minHeight || pScrPriv->maxHeight < height) {
         client->errorValue = height;
-        xfree(pData);
+        free(pData);
         return BadValue;
     }
 
@@ -1159,7 +1159,7 @@ ProcRRSetScreenConfig(ClientPtr client)
 
  sendReply:
 
-    xfree(pData);
+    free(pData);
 
     rep = (xRRSetScreenConfigReply) {
         .type = X_Reply,
@@ -1202,7 +1202,7 @@ RR10CurrentSizeID(ScreenPtr pScreen)
                     sizeID = (CARD16) i;
                     break;
                 }
-            xfree(data);
+            free(data);
         }
     }
     return sizeID;
diff --git a/nx-X11/programs/Xserver/randr/rrtransform.c b/nx-X11/programs/Xserver/randr/rrtransform.c
index 4377d09aa..743e227ea 100644
--- a/nx-X11/programs/Xserver/randr/rrtransform.c
+++ b/nx-X11/programs/Xserver/randr/rrtransform.c
@@ -37,7 +37,7 @@ RRTransformInit(RRTransformPtr transform)
 void
 RRTransformFini(RRTransformPtr transform)
 {
-    xfree(transform->params);
+    free(transform->params);
 }
 
 Bool
@@ -81,7 +81,7 @@ RRTransformSetFilter(RRTransformPtr dst,
     }
     else
         new_params = NULL;
-    xfree(dst->params);
+    free(dst->params);
     dst->filter = filter;
     dst->params = new_params;
     dst->nparams = nparams;