diff options
| author | Ilya ilyxa Tyshchenko <devel@nest.org.ru> | 2017-12-21 16:55:24 +0000 |
|---|---|---|
| committer | Max Kellermann <max@musicpd.org> | 2017-12-21 18:42:36 +0100 |
| commit | 2becf7922364be08a79e6e0b921b6d07146a05b3 (patch) | |
| tree | bfee0f166e7972e43978b7c5830fe545e8302e8f | |
| parent | 43ec96d4a0b90179b60cf92698ea90f9248124c5 (diff) | |
correct action for compile on Solaris 11.3 X86
| -rw-r--r-- | NEWS | 1 | ||||
| -rw-r--r-- | src/util/WStringAPI.hxx | 6 |
2 files changed, 7 insertions, 0 deletions
@@ -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 |