1 files changed, 1 insertions, 6 deletions
diff --git a/qpid/cpp/src/qpid/sys/windows/StrError.cpp b/qpid/cpp/src/qpid/sys/windows/StrError.cpp
index 546d399d16..9c1bfcd79c 100755
--- a/qpid/cpp/src/qpid/sys/windows/StrError.cpp
+++ b/qpid/cpp/src/qpid/sys/windows/StrError.cpp
@@ -30,7 +30,6 @@ namespace sys {
 std::string strError(int err) {
     const size_t bufsize = 512;
     char buf[bufsize];
-    buf[0] = 0;
     if (0 == FormatMessage (FORMAT_MESSAGE_MAX_WIDTH_MASK
                             | FORMAT_MESSAGE_FROM_SYSTEM,
                             0,
@@ -40,11 +39,7 @@ std::string strError(int err) {
                             bufsize,
                             0))
     {
-#ifdef _MSC_VER
-        strerror_s(buf, bufsize, err);
-#else
-        return std::string(strerror(err));
-#endif
+        strerror_s (buf, bufsize, err);
     }
     return std::string(buf);
 }