aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/programs/Xserver/dix
diff options
context:
space:
mode:
authorMihai Moldovan <ïonic@ionic.de>2016-09-12 02:59:02 +0000
committerMihai Moldovan <ïonic@ionic.de>2017-03-03 11:20:20 +0000
commit5413c5ec8b17dcc223b31f9d08fa3f3c3665d83e (patch)
tree0ebd53bdaa410fc836b2e36a1cf2ec260634d346 /nx-X11/programs/Xserver/dix
parentcd1dcdb2b7458717c6692e43c4ecc36e92a3f81c (diff)
downloadnx-libs-5413c5ec8b17dcc223b31f9d08fa3f3c3665d83e.tar.gz
nx-libs-5413c5ec8b17dcc223b31f9d08fa3f3c3665d83e.tar.bz2
nx-libs-5413c5ec8b17dcc223b31f9d08fa3f3c3665d83e.zip
misc nx-X11/programs/Xserver/{composite,dix,randr}/: switch to using reallocarray, since it has been ported now.
Diffstat (limited to 'nx-X11/programs/Xserver/dix')
-rw-r--r--nx-X11/programs/Xserver/dix/colormap.c9
1 files changed, 0 insertions, 9 deletions
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;
}