From 74a5450bc058354e55c1589e64ef8e73775cebc4 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Sun, 26 Jun 2016 02:08:32 +0200 Subject: nx-X11/programs/Xserver: Drop {X,x}realloc() macros, use realloc() instead. --- nx-X11/programs/Xserver/randr/rrcrtc.c | 4 ++-- nx-X11/programs/Xserver/randr/rrinfo.c | 6 +++--- nx-X11/programs/Xserver/randr/rrmode.c | 2 +- nx-X11/programs/Xserver/randr/rrmonitor.c | 2 +- nx-X11/programs/Xserver/randr/rroutput.c | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-) (limited to 'nx-X11/programs/Xserver/randr') diff --git a/nx-X11/programs/Xserver/randr/rrcrtc.c b/nx-X11/programs/Xserver/randr/rrcrtc.c index e7add9d60..95f02b8cd 100644 --- a/nx-X11/programs/Xserver/randr/rrcrtc.c +++ b/nx-X11/programs/Xserver/randr/rrcrtc.c @@ -86,7 +86,7 @@ RRCrtcCreate(ScreenPtr pScreen, void *devPrivate) crtcs = reallocarray(pScrPriv->crtcs, pScrPriv->numCrtcs + 1, sizeof(RRCrtcPtr)); #else /* !defined(NXAGENT_SERVER) */ - crtcs = xrealloc(pScrPriv->crtcs, + crtcs = realloc(pScrPriv->crtcs, (pScrPriv->numCrtcs + 1) * sizeof(RRCrtcPtr)); #endif /* !defined(NXAGENT_SERVER) */ else @@ -202,7 +202,7 @@ RRCrtcNotify(RRCrtcPtr crtc, newoutputs = reallocarray(crtc->outputs, numOutputs, sizeof(RROutputPtr)); #else /* !defined(NXAGENT_SERVER) */ - newoutputs = xrealloc(crtc->outputs, + newoutputs = realloc(crtc->outputs, numOutputs * sizeof(RROutputPtr)); #endif /* !defined(NXAGENT_SERVER) */ else diff --git a/nx-X11/programs/Xserver/randr/rrinfo.c b/nx-X11/programs/Xserver/randr/rrinfo.c index c5075572f..bea921436 100644 --- a/nx-X11/programs/Xserver/randr/rrinfo.c +++ b/nx-X11/programs/Xserver/randr/rrinfo.c @@ -59,7 +59,7 @@ RROldModeAdd(RROutputPtr output, RRScreenSizePtr size, int refresh) modes = reallocarray(output->modes, output->numModes + 1, sizeof(RRModePtr)); #else /* !defined(NXAGENT_SERVER) */ - modes = xrealloc(output->modes, + modes = realloc(output->modes, (output->numModes + 1) * sizeof(RRModePtr)); #endif /* !defined(NXAGENT_SERVER) */ else @@ -275,7 +275,7 @@ RRRegisterSize(ScreenPtr pScreen, pNew = reallocarray(pScrPriv->pSizes, pScrPriv->nSizes + 1, sizeof(RRScreenSize)); #else /* !defined(NXAGENT_SERVER) */ - pNew = xrealloc(pScrPriv->pSizes, + pNew = realloc(pScrPriv->pSizes, (pScrPriv->nSizes + 1) * sizeof(RRScreenSize)); #endif /* !defined(NXAGENT_SERVER) */ if (!pNew) @@ -302,7 +302,7 @@ RRRegisterRate(ScreenPtr pScreen, RRScreenSizePtr pSize, int rate) #ifndef NXAGENT_SERVER pNew = reallocarray(pSize->pRates, pSize->nRates + 1, sizeof(RRScreenRate)); #else /* !defined(NXAGENT_SERVER) */ - pNew = xrealloc(pSize->pRates, (pSize->nRates + 1) * sizeof(RRScreenRate)); + pNew = realloc(pSize->pRates, (pSize->nRates + 1) * sizeof(RRScreenRate)); #endif /* !defined(NXAGENT_SERVER) */ if (!pNew) return FALSE; diff --git a/nx-X11/programs/Xserver/randr/rrmode.c b/nx-X11/programs/Xserver/randr/rrmode.c index e8dd208a1..c4718c1b4 100644 --- a/nx-X11/programs/Xserver/randr/rrmode.c +++ b/nx-X11/programs/Xserver/randr/rrmode.c @@ -99,7 +99,7 @@ RRModeCreate(xRRModeInfo * modeInfo, const char *name, ScreenPtr userScreen) #ifndef NXAGENT_SERVER newModes = reallocarray(modes, num_modes + 1, sizeof(RRModePtr)); #else /* !defined(NXAGENT_SERVER) */ - newModes = xrealloc(modes, (num_modes + 1) * sizeof(RRModePtr)); + newModes = realloc(modes, (num_modes + 1) * sizeof(RRModePtr)); #endif /* !defined(NXAGENT_SERVER) */ else diff --git a/nx-X11/programs/Xserver/randr/rrmonitor.c b/nx-X11/programs/Xserver/randr/rrmonitor.c index 0e5514415..651dd47f8 100644 --- a/nx-X11/programs/Xserver/randr/rrmonitor.c +++ b/nx-X11/programs/Xserver/randr/rrmonitor.c @@ -512,7 +512,7 @@ RRMonitorAdd(ClientPtr client, ScreenPtr screen, RRMonitorPtr monitor) pScrPriv->numMonitors + 1, sizeof(RRMonitorPtr)); #else /* !defined(NXAGENT_SERVER) */ - monitors = xrealloc(pScrPriv->monitors, + monitors = realloc(pScrPriv->monitors, (pScrPriv->numMonitors + 1) * sizeof(RRMonitorPtr)); #endif /* !defined(NXAGENT_SERVER) */ else diff --git a/nx-X11/programs/Xserver/randr/rroutput.c b/nx-X11/programs/Xserver/randr/rroutput.c index 7be00ab5e..4a3d32a12 100644 --- a/nx-X11/programs/Xserver/randr/rroutput.c +++ b/nx-X11/programs/Xserver/randr/rroutput.c @@ -79,7 +79,7 @@ RROutputCreate(ScreenPtr pScreen, outputs = reallocarray(pScrPriv->outputs, pScrPriv->numOutputs + 1, sizeof(RROutputPtr)); #else /* !defined(NXAGENT_SERVER) */ - outputs = xrealloc(pScrPriv->outputs, + outputs = realloc(pScrPriv->outputs, (pScrPriv->numOutputs + 1) * sizeof(RROutputPtr)); #endif /* !defined(NXAGENT_SERVER) */ else @@ -232,7 +232,7 @@ RROutputAddUserMode(RROutputPtr output, RRModePtr mode) newModes = reallocarray(output->userModes, output->numUserModes + 1, sizeof(RRModePtr)); #else /* !defined(NXAGENT_SERVER) */ - newModes = xrealloc(output->userModes, + newModes = realloc(output->userModes, (output->numUserModes + 1) * sizeof(RRModePtr)); #endif /* !defined(NXAGENT_SERVER) */ else -- cgit v1.2.3