9ded8d2 Fix some issues present in the upstream patch for condvar issue

Authored and Committed by pkubat 7 years ago
    Fix some issues present in the upstream patch for condvar issue
    
    Leftover "#define static" from upstream testing
    Unnecessary renaming of variables/functions
    
    Resolves: #1394862
    
        
file modified
+360 -519
file modified
+20 -16