Uses less macros. #ifdef'ed out unused functions. Edited slightly to be

more in the same style as other curl source code. The only actual code change
is an added check after a malloc() call.