diff options
| author | Mihai Moldovan <ïonic@ionic.de> | 2016-08-17 04:34:50 +0000 |
|---|---|---|
| committer | Mihai Moldovan <ïonic@ionic.de> | 2017-03-03 11:20:19 +0000 |
| commit | d189cb422b1aa14deaa490a4079ae51ab08ef641 (patch) | |
| tree | d32de4f4590192a6a074cf7622084128f46d557d /nx-X11/config | |
| parent | 1a7fc41c2c011c05c3dc0cd8eb4ade98a2186217 (diff) | |
| download | nx-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/config')
| -rw-r--r-- | nx-X11/config/cf/Imake.tmpl | 3 | ||||
| -rw-r--r-- | nx-X11/config/cf/X11.tmpl | 9 | ||||
| -rw-r--r-- | nx-X11/config/cf/linux.cf | 3 |
3 files changed, 14 insertions, 1 deletions
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 */ |