6e60a0a Pull in patch from upstream to fix build

Authored and Committed by zbyszek 6 years ago
    Pull in patch from upstream to fix build
    
    Also modernize a bit.
    
        
file modified
+8 -3