Guard some macros because they conflict with Windows
Merge branch 'develop' of github.com:Barobo/libbarobo into develop