declaration fixes for clang compatibility
Merge pull request #2 from ybroze/master

declaration fixes for clang compatibility