Skip to content

M
mpd
Commit 2becf792 authored by Ilya ilyxa Tyshchenko's avatar Ilya ilyxa Tyshchenko Committed by Max Kellermann
Browse files
Options

correct action for compile on Solaris 11.3 X86

parent 43ec96d4
Show whitespace changes
Inline Side-by-side
Showing with 7 additions and 0 deletions
NEWS
View file @ 2becf792
ver 0.20.14 (not yet released) ver 0.20.14 (not yet released)
* database * database
- simple: fix file corruption in the presence of mount points - simple: fix file corruption in the presence of mount points
* fix Solaris build failure
ver 0.20.13 (2017/12/18) ver 0.20.13 (2017/12/18)
* output * output
......
src/util/WStringAPI.hxx
View file @ 2becf792
...@@ -106,6 +106,8 @@ UnsafeCopyStringP(wchar_t *dest, const wchar_t *src) noexcept ...@@ -106,6 +106,8 @@ UnsafeCopyStringP(wchar_t *dest, const wchar_t *src) noexcept
/* emulate wcpcpy() */ /* emulate wcpcpy() */
UnsafeCopyString(dest, src); UnsafeCopyString(dest, src);
return dest + StringLength(dest); return dest + StringLength(dest);
#elif defined(__sun) && defined (__SVR4)
return std::wcpcpy(dest, src);
#else #else
return wcpcpy(dest, src); return wcpcpy(dest, src);
#endif #endif
...@@ -140,7 +142,11 @@ gcc_malloc gcc_nonnull_all ...@@ -140,7 +142,11 @@ gcc_malloc gcc_nonnull_all
static inline wchar_t * static inline wchar_t *
DuplicateString(const wchar_t *p) DuplicateString(const wchar_t *p)
{ {
#if defined(__sun) && defined (__SVR4)
return std::wcsdup(p);
#else
return wcsdup(p); return wcsdup(p);
#endif
} }
#endif #endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment