Fixes #4140: Move r30333 to v1.7 branch (Cleanup warnings for use of)

---svn-pre-commit-ignore-below---

r30333 [[BR]]
Cleanup warnings for use of void* - requires intermediate cast to uintptr_t. Thanks to Paul Hargrove for reporting it

cmr=v1.7.4:reviewer=jsquyres