fix one typo in prototype and one useless prototype which caused warnings on perl 5.12+
Merge branch 'master' into development