InMoved preprocessor check to fit conventions
Merge branch 'develop' of https://github.com/ccore/ccore into develop