Re-apply change from commit v2.6.0~921 (Fix warnings on 64-bit Mac OS X build, 2007-11-05) on updated upstream curl.
Resolve all conflicts in favor of the upstream side. We can re-apply specific changes later.
Update our build files as needed to compensate.