8d55ef Replace define macros with global ones

Authored and Committed by swt2c 3 years ago
    Replace define macros with global ones
    
        
file modified
+5 -2