Bug 876661. Fix function hidden warnings. r=mattwoodrow

--HG--
extra : rebase_source : d008e636467c573723bc7de9cd0e13262d4ee9c1