Revert r194247 conditional on non-MSVC.

These definitions are required by the standard.  MSVC rejecting them
appears to be a bug.