From d189cb422b1aa14deaa490a4079ae51ab08ef641 Mon Sep 17 00:00:00 2001
From: Mihai Moldovan <ïonic@ionic.de>
Date: Wed, 17 Aug 2016 04:34:50 +0000
Subject: 
 nx-X11/{config/cf/{{Imake,X11}.tmpl,linux.cf},programs/Xserver/{include/os.h,os/{Imakefile,reallocarray.c}}:
 backport reallocarray() implementation.

---
 nx-X11/programs/Xserver/os/Imakefile | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'nx-X11/programs/Xserver/os/Imakefile')

diff --git a/nx-X11/programs/Xserver/os/Imakefile b/nx-X11/programs/Xserver/os/Imakefile
index 26d9c6dff..2abc1aff9 100644
--- a/nx-X11/programs/Xserver/os/Imakefile
+++ b/nx-X11/programs/Xserver/os/Imakefile
@@ -102,6 +102,11 @@ STRLCAT_SRCS = strlcat.c strlcpy.c
 STRLCAT_OBJS = strlcat.o strlcpy.o
 #endif
 
+#if !HasReallocarray
+REALLOCARRAY_SRCS = reallocarray.c
+REALLOCARRAY_OBJS = reallocarray.o
+#endif
+
 #if HasGetpeerucred
 GETPEER_DEFINES = -DHAS_GETPEERUCRED
 #else
@@ -115,12 +120,12 @@ BOOTSTRAPCFLAGS =
                   osinit.c utils.c log.c auth.c mitauth.c secauth.c \
                   $(XDMAUTHSRCS) $(RPCSRCS) xdmcp.c OtherSources \
                   xstrans.c $(SNPRINTF_SRCS) $(STRLCAT_SRCS) \
-		  xprintf.c
+		  $(REALLOCARRAY_SRCS) xprintf.c
            OBJS = WaitFor.o access.o connection.o io.o $(COLOR_OBJS) \
                   osinit.o utils.o log.o auth.o mitauth.o secauth.o \
                   $(XDMAUTHOBJS) $(RPCOBJS) xdmcp.o OtherObjects \
                   xstrans.o $(SNPRINTF_OBJS) $(STRLCAT_OBJS) \
-		  xprintf.o
+		  $(REALLOCARRAY_OBJS) xprintf.o
 
 #if UseMemLeak
      MEM_DEFINES = -DMEMBUG
-- 
cgit v1.2.3