mirror of
https://github.com/gabime/spdlog.git
synced 2024-12-25 18:11:33 +08:00
Merge pull request #314 from osx2000/master
Compatibility with Oracle Developer Studio 12.5 on Solaris
This commit is contained in:
commit
4e768c146b
@ -359,7 +359,7 @@ inline void spdlog::details::async_log_helper::sleep_or_yield(const spdlog::log_
|
||||
|
||||
// yield upto 150 micros
|
||||
if (time_since_op <= microseconds(100))
|
||||
return yield();
|
||||
return std::this_thread::yield();
|
||||
|
||||
|
||||
// sleep for 20 ms upto 200 ms
|
||||
|
@ -343,7 +343,7 @@ inline std::string errno_str(int err_num)
|
||||
else
|
||||
return "Unkown error";
|
||||
|
||||
#elif defined(__FreeBSD__) || defined(__APPLE__) || defined(ANDROID) || \
|
||||
#elif defined(__FreeBSD__) || defined(__APPLE__) || defined(ANDROID) || defined(__SUNPRO_CC) || \
|
||||
((_POSIX_C_SOURCE >= 200112L) && ! _GNU_SOURCE) // posix version
|
||||
|
||||
if (strerror_r(err_num, buf, buf_size) == 0)
|
||||
|
Loading…
Reference in New Issue
Block a user