Fix function declarations.
Merge pull request #5334 from openscholar/3215-fix_function

Fix function declarations.