correct action for compile on Solaris 11.3 X86

This commit is contained in:
Ilya ilyxa Tyshchenko 2017-12-21 16:55:24 +00:00 committed by Max Kellermann
parent 43ec96d4a0
commit 2becf79223
2 changed files with 7 additions and 0 deletions

1
NEWS
View File

@ -1,6 +1,7 @@
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

View File

@ -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
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