upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-04-28 01:28:05 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch '1742-work-around-an-msvc-bug' into 'master'

Browse source 
Work around an MSVC bug

Closes #1742

See merge request isc-projects/bind9!3347
This commit is contained in:
Michał Kępień 2020-04-08 12:29:10 +00:00
commit 2786ef413f
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
lib/isc/log.c
View file

@ -1454,13 +1454,15 @@ isc_log_wouldlog(isc_log_t *lctx, int level) {
return (false);
}
if (level <= atomic_load_acquire(&lctx->highest_level)) {
int highest_level = atomic_load_acquire(&lctx->highest_level);
if (level <= highest_level) {
return (true);
}
if (atomic_load_acquire(&lctx->dynamic) &&
level <= atomic_load_acquire(&lctx->debug_level))
{
return (true);
if (atomic_load_acquire(&lctx->dynamic)) {
int debug_level = atomic_load_acquire(&lctx->debug_level);
if (level <= debug_level) {
return (true);
}
}
return (false);