From 5413c5ec8b17dcc223b31f9d08fa3f3c3665d83e Mon Sep 17 00:00:00 2001 From: Mihai Moldovan <ïonic@ionic.de> Date: Mon, 12 Sep 2016 02:59:02 +0000 Subject: misc nx-X11/programs/Xserver/{composite,dix,randr}/: switch to using reallocarray, since it has been ported now. --- nx-X11/programs/Xserver/dix/colormap.c | 9 --------- 1 file changed, 9 deletions(-) (limited to 'nx-X11/programs/Xserver/dix') diff --git a/nx-X11/programs/Xserver/dix/colormap.c b/nx-X11/programs/Xserver/dix/colormap.c index 8b0e1e421..d4ad5114c 100644 --- a/nx-X11/programs/Xserver/dix/colormap.c +++ b/nx-X11/programs/Xserver/dix/colormap.c @@ -2721,13 +2721,8 @@ ResizeVisualArray(ScreenPtr pScreen, int new_visual_count, DepthPtr depth) first_new_vid = depth->numVids; first_new_visual = pScreen->numVisuals; -#if 0 /* !defined(NXAGENT_SERVER) */ vids = reallocarray(depth->vids, depth->numVids + new_visual_count, sizeof(XID)); -#else - vids = realloc(depth->vids, sizeof(XID) * - (depth->numVids + new_visual_count)); -#endif if (!vids) return FALSE; @@ -2735,11 +2730,7 @@ ResizeVisualArray(ScreenPtr pScreen, int new_visual_count, DepthPtr depth) depth->vids = vids; numVisuals = pScreen->numVisuals + new_visual_count; -#if 0 /* !defined(NXAGENT_SERVER) */ visuals = reallocarray(pScreen->visuals, numVisuals, sizeof(VisualRec)); -#else - visuals = realloc(pScreen->visuals, sizeof(VisualRec) * numVisuals); -#endif if (!visuals) { return FALSE; } -- cgit v1.2.3