Get rid of an unnecessary cast by declaring the right pointer type
Merge pull request #448 from mstorsjo/use-correct-pointer-type

Get rid of an unnecessary cast by declaring the right pointer type
Merge remote-tracking branch 'upstream/master' into travis.android