Resolve compiler warnings about mismatched declarations
Resolve compiler warnings about casting void* to function pointer
Merge pull request #65 from Metaswitch/compiler-warnings

No reviewer - Compiler warnings
Merge remote-tracking branch 'origin/master' into sto536