OTLog: fix macros
Merge pull request #309 from toxeus/fixMacros

OTLog: fix macros
Fix some -Wshadow warnings.