Improve compatibility with Dinkumware C++ headers

folly/Conv.h

@@ -39,6 +39,7 @@
 #include <folly/Demangle.h>
 #include <folly/Expected.h>
 #include <folly/FBString.h>
+#include <folly/GLog.h>
 #include <folly/Likely.h>
 #include <folly/Range.h>
 #include <folly/Traits.h>

folly/FBString.h

@@ -2796,7 +2796,7 @@ operator<<(
       os.setstate(_ostream_type::badbit | _ostream_type::failbit);
     }
   }
-#elif defined(_MSC_VER)
+#elif defined(_MSC_VER) || (_CPPLIB_VER <= 800)
   typedef decltype(os.precision()) streamsize;
   // MSVC doesn't define __ostream_insert
   os.write(str.data(), static_cast<streamsize>(str.size()));

folly/Portability.h

@@ -205,7 +205,7 @@ FOLLY_GCC_DISABLE_NEW_SHADOW_WARNINGS
  */
 #if defined(_MSC_VER)
 #define FOLLY_TLS __declspec(thread)
-#elif defined(__GNUC__) || defined(__clang__)
+#elif (defined(__GNUC__) || defined(__clang__))
 #define FOLLY_TLS __thread
 #else
 #error cannot define platform specific thread local storage
@@ -219,7 +219,9 @@ FOLLY_GCC_DISABLE_NEW_SHADOW_WARNINGS
 // the 'std' namespace; the latter uses inline namespaces. Wrap this decision
 // up in a macro to make forward-declarations easier.
 #if FOLLY_USE_LIBCPP
+#if __has_include(<__config>)
 #include <__config> // @manual
+#endif
 #define FOLLY_NAMESPACE_STD_BEGIN _LIBCPP_BEGIN_NAMESPACE_STD
 #define FOLLY_NAMESPACE_STD_END _LIBCPP_END_NAMESPACE_STD
 #else

folly/String.cpp

@@ -487,7 +487,7 @@ fbstring errnoStr(int err) {
 #elif FOLLY_HAVE_XSI_STRERROR_R || defined(__APPLE__)
 
   // Using XSI-compatible strerror_r
-  int r = strerror_r(err, buf, sizeof(buf));
+  auto r = strerror_r(err, buf, sizeof(buf));
 
   // OSX/FreeBSD use EINVAL and Linux uses -1 so just check for non-zero
   if (r != 0) {

folly/Traits.h

@@ -434,10 +434,10 @@ namespace traits_detail_IsNothrowSwappable {
 // enabled.
 template <typename T>
 using IsNothrowSwappable = std::is_nothrow_swappable<T>;
-#elif _CPPLIB_VER
-// MSVC defines the base even if C++17 is disabled, and MSVC has
-// issues with our fallback implementation due to over-eager
-// evaluation of noexcept.
+#elif _CPPLIB_VER > 800
+// MSVC 2015+ defines the base even if C++17 is disabled, and
+// MSVC 2015 has issues with our fallback implementation due to
+// over-eager evaluation of noexcept.
 template <typename T>
 using IsNothrowSwappable = std::_Is_nothrow_swappable<T>;
 #else

folly/detail/ThreadLocalDetail.h

@@ -24,8 +24,6 @@
 #include <string>
 #include <vector>
 
-#include <glog/logging.h>
-
 #include <folly/Exception.h>
 #include <folly/Function.h>
 #include <folly/Portability.h>

folly/dynamic-inl.h

@@ -20,6 +20,7 @@
 #include <folly/CPortability.h>
 #include <folly/Conv.h>
 #include <folly/Format.h>
+#include <glog/logging.h>
 #include <folly/Likely.h>
 #include <folly/detail/Iterators.h>
 #include <folly/lang/Exception.h>

folly/memory/Malloc.h

@@ -95,8 +95,8 @@ mallctlbymib(const size_t*, size_t, void*, size_t*, void*, size_t)
 
 // for malloc_usable_size
 // NOTE: FreeBSD 9 doesn't have malloc.h.  Its definitions
-// are found in stdlib.h.
-#if __has_include(<malloc.h>)
+// are found in stdlib.h and it errors when including malloc.h.
+#if __has_include(<malloc.h>) && !defined(__STDC__)
 #include <malloc.h>
 #else
 #include <stdlib.h>

folly/portability/Malloc.h

@@ -26,7 +26,7 @@
 // malloc_usable_size, and that's what we should be using.
 #include <jemalloc/jemalloc.h>
 #else
-#ifndef __APPLE__
+#if !defined(__APPLE__) && !defined(__STDC__)
 #include <malloc.h>
 #endif
 

folly/system/ThreadId.h

@@ -23,6 +23,10 @@
 #include <folly/portability/Unistd.h>
 #include <folly/portability/Windows.h>
 
+#if __has_include(<pthread_np.h>)
+#include <pthread_np.h>
+#endif
+
 namespace folly {
 
 /**
@@ -82,6 +86,8 @@ inline uint64_t getOSThreadID() {
   uint64_t tid;
   pthread_threadid_np(nullptr, &tid);
   return tid;
+#elif __has_include(<pthread_np.h>)
+  return uint64_t(pthread_getthreadid_np());
 #elif _WIN32
   return uint64_t(GetCurrentThreadId());
 #else