Changed for clang on Windows which defines _MSC_VER.

[SVN r86004]
Revert previous change for clang.

[SVN r86011]
Reinstate fix for clang so that it is recognized as strict compliance.

[SVN r86044]