aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/programs/Xserver/os/Imakefile
diff options
context:
space:
mode:
authorMihai Moldovan <ïonic@ionic.de>2016-08-17 04:34:50 +0000
committerMihai Moldovan <ïonic@ionic.de>2017-03-03 11:20:19 +0000
commitd189cb422b1aa14deaa490a4079ae51ab08ef641 (patch)
treed32de4f4590192a6a074cf7622084128f46d557d /nx-X11/programs/Xserver/os/Imakefile
parent1a7fc41c2c011c05c3dc0cd8eb4ade98a2186217 (diff)
downloadnx-libs-d189cb422b1aa14deaa490a4079ae51ab08ef641.tar.gz
nx-libs-d189cb422b1aa14deaa490a4079ae51ab08ef641.tar.bz2
nx-libs-d189cb422b1aa14deaa490a4079ae51ab08ef641.zip
nx-X11/{config/cf/{{Imake,X11}.tmpl,linux.cf},programs/Xserver/{include/os.h,os/{Imakefile,reallocarray.c}}: backport reallocarray() implementation.
Diffstat (limited to 'nx-X11/programs/Xserver/os/Imakefile')
-rw-r--r--nx-X11/programs/Xserver/os/Imakefile9
1 files changed, 7 insertions, 2 deletions
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