From 78230d5f0d0d19968d542f50adde90f4cef8c38f Mon Sep 17 00:00:00 2001 From: Orvid King Date: Wed, 29 Jul 2015 14:51:46 -0700 Subject: [PATCH 1/1] Use strerror_s on MSVC Summary: Support for this under mingw was already present, this just uses that for MSVC as well. Closes #273 Reviewed By: @yfeldblum Differential Revision: D2284007 Pulled By: @sgolemon --- folly/String.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/folly/String.cpp b/folly/String.cpp index 7e23a664..5042cec9 100644 --- a/folly/String.cpp +++ b/folly/String.cpp @@ -330,7 +330,7 @@ fbstring errnoStr(int err) { // https://developer.apple.com/library/mac/documentation/Darwin/Reference/ManPages/man3/strerror_r.3.html // http://www.kernel.org/doc/man-pages/online/pages/man3/strerror.3.html -#if defined(_WIN32) && defined(__MINGW32__) +#if defined(_WIN32) && (defined(__MINGW32__) || defined(_MSC_VER)) // mingw64 has no strerror_r, but Windows has strerror_s, which C11 added // as well. So maybe we should use this across all platforms (together // with strerrorlen_s). Note strerror_r and _s have swapped args. -- 2.34.1