r2: lets make the older VS compilers happy again
Merge branch 'master' of github.com:etlegacy/etlegacy
Merge branch 'master' of github.com:etlegacy/etlegacy
Merge branch 'master' of github.com:etlegacy/etlegacy
Merge branch 'master' of github.com:etlegacy/etlegacy
Merge branch 'master' of github.com:etlegacy/etlegacy
r2: cleanup and macro fix