fixed redefinition bug
Merge branch 'develop' of https://github.com/csound/csound into develop
protected compilation on OSX