0dea303 Replace define macros with global ones

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