9102707 Use make_* macros

Authored and Committed by jplesnik 4 years ago
    Use make_* macros
    
        
file modified
+8 -7