This change is also being done so that it's easier to compare the options against the Cygwin/MSVC build (the only way left to use MSVC 6). Some of the definitions/options aren't used at all or are redundant. X-SVN-Rev: 17285
X-SVN-Rev: 17055