Re-apply change from commit v3.0.0-rc1~541^2~1 (Haiku: Remove outdated preprocessor checks, 2013-10-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.