Changed for clang on Windows which defines _MSC_VER.
Revert previous change for clang.
Reinstate fix for clang so that it is recognized as strict compliance.