From 2becf7922364be08a79e6e0b921b6d07146a05b3 Mon Sep 17 00:00:00 2001 From: Ilya ilyxa Tyshchenko Date: Thu, 21 Dec 2017 16:55:24 +0000 Subject: [PATCH] correct action for compile on Solaris 11.3 X86 --- NEWS | 1 + src/util/WStringAPI.hxx | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/NEWS b/NEWS index 7ae86d430..75889f7ed 100644 --- a/NEWS +++ b/NEWS @@ -1,6 +1,7 @@ ver 0.20.14 (not yet released) * database - simple: fix file corruption in the presence of mount points +* fix Solaris build failure ver 0.20.13 (2017/12/18) * output diff --git a/src/util/WStringAPI.hxx b/src/util/WStringAPI.hxx index a71802dbb..7f5b6c57b 100644 --- a/src/util/WStringAPI.hxx +++ b/src/util/WStringAPI.hxx @@ -106,6 +106,8 @@ UnsafeCopyStringP(wchar_t *dest, const wchar_t *src) noexcept /* emulate wcpcpy() */ UnsafeCopyString(dest, src); return dest + StringLength(dest); +#elif defined(__sun) && defined (__SVR4) + return std::wcpcpy(dest, src); #else return wcpcpy(dest, src); #endif @@ -140,7 +142,11 @@ gcc_malloc gcc_nonnull_all static inline wchar_t * DuplicateString(const wchar_t *p) { +#if defined(__sun) && defined (__SVR4) + return std::wcsdup(p); +#else return wcsdup(p); +#endif } #endif