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/config/cf/Imake.tmpl | 3 +++
 nx-X11/config/cf/X11.tmpl   | 9 ++++++++-
 nx-X11/config/cf/linux.cf   | 3 +++
 3 files changed, 14 insertions(+), 1 deletion(-)

(limited to 'nx-X11/config/cf')

diff --git a/nx-X11/config/cf/Imake.tmpl b/nx-X11/config/cf/Imake.tmpl
index 879b55a3b..8d2526712 100644
--- a/nx-X11/config/cf/Imake.tmpl
+++ b/nx-X11/config/cf/Imake.tmpl
@@ -417,6 +417,9 @@ XCOMM the platform-specific parameters - edit site.def to change
 #ifndef HasStrlcat
 #define HasStrlcat		NO	/* assume not */
 #endif
+#ifndef HasReallocarray
+#define HasReallocarray		NO	/* assume not */
+#endif
 #ifndef HasDlopen
 #define HasDlopen		NO	/* assume not */
 #endif
diff --git a/nx-X11/config/cf/X11.tmpl b/nx-X11/config/cf/X11.tmpl
index d5527cdc7..ddd6e0bad 100644
--- a/nx-X11/config/cf/X11.tmpl
+++ b/nx-X11/config/cf/X11.tmpl
@@ -707,8 +707,15 @@ FCHOWN_DEFINES = -DHAS_FCHOWN
 #define ServerSnprintfDefines /**/
 #endif
 #endif
+#ifndef ServerReallocarrayDefines
+#if HasReallocarray
+#define ServerReallocarrayDefines -DHAVE_REALLOCARRAY
+#else
+#define ServerReallocarrayDefines /**/
+#endif
+#endif
 #ifndef ServerDefines
-#define ServerDefines StandardDefines PervasiveExtensionDefines ServerExtraDefines ServerAssertDefines ServerSnprintfDefines
+#define ServerDefines StandardDefines PervasiveExtensionDefines ServerExtraDefines ServerAssertDefines ServerSnprintfDefines ServerReallocarrayDefines
 #endif
 
 #ifndef MesaUseX86Asm
diff --git a/nx-X11/config/cf/linux.cf b/nx-X11/config/cf/linux.cf
index 1a3f6bc5b..2f5aa11f6 100644
--- a/nx-X11/config/cf/linux.cf
+++ b/nx-X11/config/cf/linux.cf
@@ -402,6 +402,9 @@ XCOMM binutils:	(LinuxBinUtilsMajorVersion)
 #ifndef HasSnprintf
 #define HasSnprintf		YES
 #endif
+#ifndef HasReallocarray
+#define HasReallocarray		NO
+#endif
 #define HasMkstemp		YES
 #endif
 /* getresuid() appeared in 2.1.4, and getresgid in 2.1.44 */
-- 
cgit v1.2.3