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

4 files changed, 10 insertions, 10 deletions

diff --git a/nx-X11/programs/Xserver/randr/randr.c b/nx-X11/programs/Xserver/randr/randr.c
index afce35d7d..8ff3f9c75 100644
--- a/nx-X11/programs/Xserver/randr/randr.c
+++ b/nx-X11/programs/Xserver/randr/randr.c
@@ -321,7 +321,7 @@ RRScreenInit(ScreenPtr pScreen)
     if (!RRInit())
         return FALSE;
 
-    pScrPriv = (rrScrPrivPtr) xcalloc(1, sizeof(rrScrPrivRec));
+    pScrPriv = (rrScrPrivPtr) calloc(1, sizeof(rrScrPrivRec));
     if (!pScrPriv)
         return FALSE;
 
diff --git a/nx-X11/programs/Xserver/randr/rrcrtc.c b/nx-X11/programs/Xserver/randr/rrcrtc.c
index 95f02b8cd..4c9b805c2 100644
--- a/nx-X11/programs/Xserver/randr/rrcrtc.c
+++ b/nx-X11/programs/Xserver/randr/rrcrtc.c
@@ -95,7 +95,7 @@ RRCrtcCreate(ScreenPtr pScreen, void *devPrivate)
         return FALSE;
     pScrPriv->crtcs = crtcs;
 
-    crtc = xcalloc(1, sizeof(RRCrtcRec));
+    crtc = calloc(1, sizeof(RRCrtcRec));
     if (!crtc)
         return NULL;
     crtc->id = FakeClientID(0);
@@ -370,7 +370,7 @@ RRComputeContiguity(ScreenPtr pScreen)
     Bool discontiguous = TRUE;
     int i, n = pScrPriv->numCrtcs;
 
-    int *reachable = xcalloc(n, sizeof(int));
+    int *reachable = calloc(n, sizeof(int));
 
     if (!reachable)
         goto out;
@@ -1673,7 +1673,7 @@ ProcRRGetCrtcTransform(ClientPtr client)
     nextra = (transform_filter_length(pending) +
               transform_filter_length(current));
 
-    reply = xcalloc(1, sizeof(xRRGetCrtcTransformReply) + nextra);
+    reply = calloc(1, sizeof(xRRGetCrtcTransformReply) + nextra);
     if (!reply)
         return BadAlloc;
 
diff --git a/nx-X11/programs/Xserver/randr/rrmonitor.c b/nx-X11/programs/Xserver/randr/rrmonitor.c
index 651dd47f8..42e0de64a 100644
--- a/nx-X11/programs/Xserver/randr/rrmonitor.c
+++ b/nx-X11/programs/Xserver/randr/rrmonitor.c
@@ -95,7 +95,7 @@ RRMonitorSetFromServer(RRCrtcPtr crtc, RRMonitorPtr monitor)
     monitor->name = RRMonitorCrtcName(crtc);
     monitor->pScreen = crtc->pScreen;
     monitor->numOutputs = crtc->numOutputs;
-    monitor->outputs = xcalloc(crtc->numOutputs, sizeof(RRCrtc));
+    monitor->outputs = calloc(crtc->numOutputs, sizeof(RRCrtc));
     if (!monitor->outputs)
         return FALSE;
     for (o = 0; o < crtc->numOutputs; o++)
@@ -173,7 +173,7 @@ RRMonitorSetFromClient(RRMonitorPtr client_monitor, RRMonitorPtr monitor)
     monitor->name = client_monitor->name;
     monitor->pScreen = client_monitor->pScreen;
     monitor->numOutputs = client_monitor->numOutputs;
-    monitor->outputs = xcalloc(client_monitor->numOutputs, sizeof(RROutput));
+    monitor->outputs = calloc(client_monitor->numOutputs, sizeof(RROutput));
     if (!monitor->outputs && client_monitor->numOutputs)
         return FALSE;
     memcpy(monitor->outputs, client_monitor->outputs, client_monitor->numOutputs * sizeof(RROutput));
@@ -216,7 +216,7 @@ RRMonitorInitList(ScreenPtr screen, RRMonitorListPtr mon_list, Bool get_active)
 #endif
     mon_list->num_crtcs = numCrtcs;
 
-    mon_list->server_crtc = xcalloc(numCrtcs * 2, sizeof(RRCrtcPtr));
+    mon_list->server_crtc = calloc(numCrtcs * 2, sizeof(RRCrtcPtr));
     if (!mon_list->server_crtc)
         return FALSE;
 
@@ -321,7 +321,7 @@ RRMonitorMakeList(ScreenPtr screen, Bool get_active, RRMonitorPtr * monitors_ret
     if (!RRMonitorInitList(screen, &list, get_active))
         return FALSE;
 
-    monitors = xcalloc(list.num_client + list.num_server, sizeof(RRMonitorRec));
+    monitors = calloc(list.num_client + list.num_server, sizeof(RRMonitorRec));
     if (!monitors) {
         RRMonitorFiniList(&list);
         return FALSE;
@@ -409,7 +409,7 @@ RRMonitorAlloc(int noutput)
 {
     RRMonitorPtr monitor;
 
-    monitor = xcalloc(1, sizeof(RRMonitorRec) + noutput * sizeof(RROutput));
+    monitor = calloc(1, sizeof(RRMonitorRec) + noutput * sizeof(RROutput));
     if (!monitor)
         return NULL;
     monitor->numOutputs = noutput;
diff --git a/nx-X11/programs/Xserver/randr/rrprovider.c b/nx-X11/programs/Xserver/randr/rrprovider.c
index 1c292b05e..7d3096482 100644
--- a/nx-X11/programs/Xserver/randr/rrprovider.c
+++ b/nx-X11/programs/Xserver/randr/rrprovider.c
@@ -380,7 +380,7 @@ RRProviderCreate(ScreenPtr pScreen, const char *name,
 
     pScrPriv = rrGetScrPriv(pScreen);
 
-    provider = xcalloc(1, sizeof(RRProviderRec) + nameLength + 1);
+    provider = calloc(1, sizeof(RRProviderRec) + nameLength + 1);
     if (!provider)
         return NULL;