And here is the rest of Hirokazu Yamamoto's patch for VS6.0 support. Thanks Hiro!

(This time, it's the correct branch :)