664acf2 Simplify version macros

Authored and Committed by kalev 6 years ago
    Simplify version macros