Fix duplicate definitions in ROOT macros
Merge pull request #6853 from wmtan/FixDuplicateDefinitions

Fix duplicate definitions in ROOT macros