diff --git a/lib/Support/Windows/Program.inc b/lib/Support/Windows/Program.inc
index 5827c105afa..07baf7ed29b 100644
--- a/lib/Support/Windows/Program.inc
+++ b/lib/Support/Windows/Program.inc
@@ -426,14 +426,14 @@ error_code sys::ChangeStdinToBinary(){
   int result = _setmode( _fileno(stdin), _O_BINARY );
   if (result == -1)
     return error_code(errno, generic_category());
-  return make_error_code(errc::success);
+  return error_code();
 }
 
 error_code sys::ChangeStdoutToBinary(){
   int result = _setmode( _fileno(stdout), _O_BINARY );
   if (result == -1)
     return error_code(errno, generic_category());
-  return make_error_code(errc::success);
+  return error_code();
 }
 
 bool llvm::sys::argumentsFitWithinSystemLimits(ArrayRef<const char*> Args) {
diff --git a/lib/Support/Windows/system_error.inc b/lib/Support/Windows/system_error.inc
index 37ec81dd363..89492efad38 100644
--- a/lib/Support/Windows/system_error.inc
+++ b/lib/Support/Windows/system_error.inc
@@ -57,7 +57,6 @@ _system_error_category::message(int ev) const {
 error_condition
 _system_error_category::default_error_condition(int ev) const {
   switch (ev) {
-  MAP_ERR_TO_COND(0, success);
   // Windows system -> posix_errno decode table  ---------------------------//
   // see WinError.h comments for descriptions of errors
   MAP_ERR_TO_COND(ERROR_ACCESS_DENIED,       permission_denied);