From ae1c8fd0e7284639b16aad0646ed99ecd12a89af Mon Sep 17 00:00:00 2001
From: Matt Hargett <plaztiksyke@gmail.com>
Date: Wed, 3 Oct 2018 13:19:03 -0700
Subject: [PATCH 01/10] Fix compilation with Dinkumware headers older than
 version 601 on FreeBSD.

---
 folly/Conv.h                     |  1 +
 folly/ExceptionWrapper.h         |  4 ++
 folly/FBString.h                 |  2 +-
 folly/GLog.h                     | 17 ++++++
 folly/Portability.h              |  6 ++-
 folly/String.cpp                 |  3 +-
 folly/String.h                   |  1 +
 folly/Traits.h                   |  2 +-
 folly/Utility.h                  |  4 ++
 folly/container/SparseByteSet.h  |  6 ++-
 folly/detail/Futex.h             |  6 ++-
 folly/detail/RangeCommon.h       |  3 --
 folly/detail/RangeSse42.cpp      |  4 +-
 folly/detail/ThreadLocalDetail.h |  2 -
 folly/dynamic-inl.h              |  1 +
 folly/dynamic.h                  |  4 ++
 folly/folly-config.h             | 88 ++++++++++++++++++++++++++++++++
 folly/hash/Hash.h                |  8 +++
 folly/hash/SpookyHashV1.h        |  4 ++
 folly/hash/SpookyHashV2.h        |  4 ++
 folly/lang/Bits.h                |  8 +++
 folly/memory/Malloc.h            |  4 +-
 folly/portability/Malloc.h       |  2 +-
 folly/portability/PThread.h      |  4 +-
 folly/system/ThreadId.h          |  4 +-
 25 files changed, 172 insertions(+), 20 deletions(-)
 create mode 100644 folly/folly-config.h

diff --git a/folly/Conv.h b/folly/Conv.h
index 9fc2fa4992d..253aef3044d 100644
--- a/folly/Conv.h
+++ b/folly/Conv.h
@@ -40,6 +40,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>
diff --git a/folly/ExceptionWrapper.h b/folly/ExceptionWrapper.h
index f3af915de5d..6bfb4a12cb4 100644
--- a/folly/ExceptionWrapper.h
+++ b/folly/ExceptionWrapper.h
@@ -20,7 +20,11 @@
 #pragma once
 
 #include <cassert>
+#if __has_include(<cstdint>) 
 #include <cstdint>
+#else 
+#include <stdint.h>
+#endif
 #include <exception>
 #include <iosfwd>
 #include <memory>
diff --git a/folly/FBString.h b/folly/FBString.h
index 43739676904..5179c3dde18 100644
--- a/folly/FBString.h
+++ b/folly/FBString.h
@@ -2789,7 +2789,7 @@ operator<<(
       os.setstate(_ostream_type::badbit | _ostream_type::failbit);
     }
   }
-#elif defined(_MSC_VER)
+#elif defined(_MSC_VER) || defined(HAS_NO_OSTREAM_INSERT)
   typedef decltype(os.precision()) streamsize;
   // MSVC doesn't define __ostream_insert
   os.write(str.data(), static_cast<streamsize>(str.size()));
diff --git a/folly/GLog.h b/folly/GLog.h
index 3724aaa59a4..989687d384e 100644
--- a/folly/GLog.h
+++ b/folly/GLog.h
@@ -16,6 +16,7 @@
 
 #pragma once
 
+#if FOLLY_HAVE_LIBGLOG
 #include <atomic>
 #include <chrono>
 
@@ -57,3 +58,19 @@
           LOG(severity)
 
 #endif
+#else
+#include <iostream>
+#ifndef FB_LOG_EVERY_MS
+#define FB_LOG_EVERY_MS(severity, milli_interval)
+#endif
+#define CHECK(x) std::cerr
+#define CHECK_GE(x,y)
+#define DCHECK_EQ(x,y)
+#define DCHECK_GT(x,y)
+#define DCHECK_LT(x,y)
+#define DCHECK_LE(x,y)
+#define DCHECK(x)
+#define WARNING 0
+#define DFATAL 0
+#define LOG(x) std::cerr
+#endif
diff --git a/folly/Portability.h b/folly/Portability.h
index e305a7cddb4..8e046c3db49 100644
--- a/folly/Portability.h
+++ b/folly/Portability.h
@@ -200,8 +200,10 @@ 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__)) && !_LIBCPP_VER 
 #define FOLLY_TLS __thread
+#elif (defined(__GNUC__) || defined(__clang__)) && _LIBCPP_VER 
+#define FOLLY_TLS thread_local
 #else
 #error cannot define platform specific thread local storage
 #endif
@@ -214,7 +216,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
diff --git a/folly/String.cpp b/folly/String.cpp
index aa838304369..ab8678153a1 100644
--- a/folly/String.cpp
+++ b/folly/String.cpp
@@ -24,8 +24,7 @@
 #include <sstream>
 #include <stdexcept>
 
-#include <glog/logging.h>
-
+#include <folly/GLog.h>
 #include <folly/Portability.h>
 #include <folly/ScopeGuard.h>
 #include <folly/container/Array.h>
diff --git a/folly/String.h b/folly/String.h
index 8cf89a873e2..3b125225075 100644
--- a/folly/String.h
+++ b/folly/String.h
@@ -28,6 +28,7 @@
 #include <folly/ExceptionString.h>
 #include <folly/FBString.h>
 #include <folly/FBVector.h>
+#include <folly/GLog.h>
 #include <folly/Portability.h>
 #include <folly/Range.h>
 #include <folly/ScopeGuard.h>
diff --git a/folly/Traits.h b/folly/Traits.h
index 9fd77a7d1cd..8832f6810ae 100644
--- a/folly/Traits.h
+++ b/folly/Traits.h
@@ -420,7 +420,7 @@ namespace traits_detail_IsNothrowSwappable {
 // is enabled.
 template <typename T>
 using IsNothrowSwappable = std::is_nothrow_swappable<T>;
-#elif _CPPLIB_VER
+#elif _CPPLIB_VER > 601
 // 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.
diff --git a/folly/Utility.h b/folly/Utility.h
index 1e3e10a523c..16f962c5a0b 100644
--- a/folly/Utility.h
+++ b/folly/Utility.h
@@ -16,7 +16,11 @@
 
 #pragma once
 
+#if __has_include(<cstdint>) 
 #include <cstdint>
+#else 
+#include <stdint.h>
+#endif
 #include <limits>
 #include <type_traits>
 #include <utility>
diff --git a/folly/container/SparseByteSet.h b/folly/container/SparseByteSet.h
index 717fa2d33bf..b5a1e12c572 100644
--- a/folly/container/SparseByteSet.h
+++ b/folly/container/SparseByteSet.h
@@ -16,9 +16,13 @@
 
 #pragma once
 
+#if __has_include(<cstdint>)
 #include <cstdint>
+#else 
+#include <stdint.h>
+#endif
 
-#include <glog/logging.h>
+#include <folly/GLog.h>
 
 namespace folly {
 
diff --git a/folly/detail/Futex.h b/folly/detail/Futex.h
index 71fa98024be..760ed62766b 100644
--- a/folly/detail/Futex.h
+++ b/folly/detail/Futex.h
@@ -19,7 +19,11 @@
 #include <atomic>
 #include <cassert>
 #include <chrono>
+#if __has_include(<cstdint>) 
 #include <cstdint>
+#else 
+#include <stdint.h>
+#endif
 #include <limits>
 #include <type_traits>
 
@@ -48,7 +52,7 @@ enum class FutexResult {
  * functions are available as free functions rather than member functions
  */
 template <template <typename> class Atom = std::atomic>
-using Futex = Atom<std::uint32_t>;
+using Futex = Atom<::uint32_t>;
 
 /**
  * Puts the thread to sleep if this->load() == expected.  Returns true when
diff --git a/folly/detail/RangeCommon.h b/folly/detail/RangeCommon.h
index 6a4321337f6..2bef8cf74f0 100644
--- a/folly/detail/RangeCommon.h
+++ b/folly/detail/RangeCommon.h
@@ -19,8 +19,6 @@
 #include <algorithm>
 #include <string>
 
-#include <glog/logging.h>
-
 #include <folly/Likely.h>
 
 namespace folly {
@@ -56,7 +54,6 @@ class StringPieceLite {
     return size() == 0;
   }
   const char& operator[](size_t i) const {
-    DCHECK_GT(size(), i);
     return b_[i];
   }
   template <typename Range>
diff --git a/folly/detail/RangeSse42.cpp b/folly/detail/RangeSse42.cpp
index b0f551f8247..b8acb1278af 100644
--- a/folly/detail/RangeSse42.cpp
+++ b/folly/detail/RangeSse42.cpp
@@ -15,9 +15,7 @@
  */
 
 #include <folly/detail/RangeSse42.h>
-
-#include <glog/logging.h>
-
+#include <folly/GLog.h>
 #include <folly/Portability.h>
 
 //  Essentially, two versions of this file: one with an SSE42 implementation
diff --git a/folly/detail/ThreadLocalDetail.h b/folly/detail/ThreadLocalDetail.h
index 67ee7dce2db..5ef6faed4da 100644
--- a/folly/detail/ThreadLocalDetail.h
+++ b/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>
diff --git a/folly/dynamic-inl.h b/folly/dynamic-inl.h
index ec89a3b5052..6a79f8364f2 100644
--- a/folly/dynamic-inl.h
+++ b/folly/dynamic-inl.h
@@ -20,6 +20,7 @@
 #include <folly/CPortability.h>
 #include <folly/Conv.h>
 #include <folly/Format.h>
+#include <folly/GLog.h>
 #include <folly/Likely.h>
 #include <folly/detail/Iterators.h>
 #include <folly/lang/Exception.h>
diff --git a/folly/dynamic.h b/folly/dynamic.h
index 49fb1f475e7..6102fdfc889 100644
--- a/folly/dynamic.h
+++ b/folly/dynamic.h
@@ -52,7 +52,11 @@
 
 #pragma once
 
+#if __has_include(<cstdint>) 
 #include <cstdint>
+#else 
+#include <stdint.h>
+#endif
 #include <memory>
 #include <ostream>
 #include <string>
diff --git a/folly/folly-config.h b/folly/folly-config.h
new file mode 100644
index 00000000000..4843f60facb
--- /dev/null
+++ b/folly/folly-config.h
@@ -0,0 +1,88 @@
+/*
+ * Copyright 2016 Facebook, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#pragma once
+
+#if !defined(FOLLY_MOBILE)
+#if defined(__ANDROID__) || \
+    (defined(__APPLE__) &&  \
+     (TARGET_IPHONE_SIMULATOR || TARGET_OS_SIMULATOR || TARGET_OS_IPHONE))
+#define FOLLY_MOBILE 1
+#else
+#define FOLLY_MOBILE 0
+#endif
+#endif // FOLLY_MOBILE
+
+// ***
+//
+// ***
+#define HAS_NO_OSTREAM_INSERT 1
+
+#define FOLLY_HAVE_PTHREAD 1
+#define FOLLY_HAVE_PTHREAD_ATFORK 0
+
+#define FOLLY_HAVE_LIBGFLAGS 0
+/* #undef FOLLY_UNUSUAL_GFLAGS_NAMESPACE */
+#define FOLLY_GFLAGS_NAMESPACE gflags
+
+#define FOLLY_HAVE_LIBGLOG 0
+
+#define FOLLY_HAVE_MALLOC_H 0
+#define FOLLY_HAVE_BITS_CXXCONFIG_H 1
+#define FOLLY_HAVE_FEATURES_H 0
+#define FOLLY_HAVE_LINUX_MEMBARRIER_H 0
+/* #undef FOLLY_USE_JEMALLOC */
+
+#if FOLLY_HAVE_FEATURES_H
+#include <features.h>
+#endif
+
+#define FOLLY_HAVE_MEMRCHR 0
+#define FOLLY_HAVE_PREADV 1
+#define FOLLY_HAVE_PWRITEV 1
+#define FOLLY_HAVE_CLOCK_GETTIME 0
+/* #undef FOLLY_HAVE_CPLUS_DEMANGLE_V3_CALLBACK */
+#define FOLLY_HAVE_OPENSSL_ASN1_TIME_DIFF 0
+
+#define FOLLY_HAVE_IFUNC 1
+#define FOLLY_HAVE_STD__IS_TRIVIALLY_COPYABLE 1
+#define FOLLY_HAVE_UNALIGNED_ACCESS 1
+#define FOLLY_HAVE_VLA 1
+#define FOLLY_HAVE_WEAK_SYMBOLS 1
+#define FOLLY_HAVE_LINUX_VDSO 0
+#define FOLLY_HAVE_MALLOC_USABLE_SIZE 1
+#define FOLLY_HAVE_INT128_T 0
+/* #undef FOLLY_SUPPLY_MISSING_INT128_TRAITS */
+#define FOLLY_HAVE_WCHAR_SUPPORT 1
+#define FOLLY_HAVE_EXTRANDOM_SFMT19937 0
+#define FOLLY_USE_LIBCPP 0
+#define FOLLY_HAVE_XSI_STRERROR_R 1
+#define HAVE_VSNPRINTF_ERRORS 1
+
+/* #undef FOLLY_HAVE_LIBDWARF_DWARF_H */
+/* #undef FOLLY_USE_SYMBOLIZER */
+#define FOLLY_DEMANGLE_MAX_SYMBOL_SIZE 1024
+
+#define FOLLY_HAVE_SHADOW_LOCAL_WARNINGS 0
+
+/* #undef FOLLY_HAVE_LIBLZ4 */
+/* #undef FOLLY_HAVE_LIBLZMA */
+/* #undef FOLLY_HAVE_LIBSNAPPY */
+#define FOLLY_HAVE_LIBZ 0
+/* #undef FOLLY_HAVE_LIBZSTD */
+/* #undef FOLLY_HAVE_LIBBZ2 */
+
+/* #undef FOLLY_SUPPORT_SHARED_LIBRARY */
diff --git a/folly/hash/Hash.h b/folly/hash/Hash.h
index 3177e9c4362..924a31914ad 100644
--- a/folly/hash/Hash.h
+++ b/folly/hash/Hash.h
@@ -16,8 +16,16 @@
 
 #pragma once
 
+#if __has_include(<cstdint>) 
 #include <cstdint>
+#else 
+#include <stdint.h>
+#endif
+#if __has_include(<cstring>) 
 #include <cstring>
+#else
+#include <string.h>
+#endif
 #include <limits>
 #include <string>
 #include <tuple>
diff --git a/folly/hash/SpookyHashV1.h b/folly/hash/SpookyHashV1.h
index 184e077eca9..e218ab25eb8 100644
--- a/folly/hash/SpookyHashV1.h
+++ b/folly/hash/SpookyHashV1.h
@@ -45,7 +45,11 @@
 #pragma once
 
 #include <cstddef>
+#if __has_include(<cstdint>) 
 #include <cstdint>
+#else 
+#include <stdint.h>
+#endif
 
 namespace folly {
 namespace hash {
diff --git a/folly/hash/SpookyHashV2.h b/folly/hash/SpookyHashV2.h
index f4431a6ef0b..f72017fea5f 100644
--- a/folly/hash/SpookyHashV2.h
+++ b/folly/hash/SpookyHashV2.h
@@ -46,7 +46,11 @@
 #pragma once
 
 #include <cstddef>
+#if __has_include(<cstdint>) 
 #include <cstdint>
+#else 
+#include <stdint.h>
+#endif
 
 namespace folly {
 namespace hash {
diff --git a/folly/lang/Bits.h b/folly/lang/Bits.h
index 779705ff1b1..af3d3c4606b 100644
--- a/folly/lang/Bits.h
+++ b/folly/lang/Bits.h
@@ -47,8 +47,16 @@
 #pragma once
 
 #include <cassert>
+#if __has_include(<cinttypes>) 
 #include <cinttypes>
+#else 
+#include <inttypes.h>
+#endif
+#if __has_include(<cstdint>) 
 #include <cstdint>
+#else 
+#include <stdint.h>
+#endif
 #include <cstring>
 #include <limits>
 #include <type_traits>
diff --git a/folly/memory/Malloc.h b/folly/memory/Malloc.h
index 3a3e545df8c..3892f2778fb 100644
--- a/folly/memory/Malloc.h
+++ b/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>
diff --git a/folly/portability/Malloc.h b/folly/portability/Malloc.h
index 2a969395934..f23ca974be3 100644
--- a/folly/portability/Malloc.h
+++ b/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
 
diff --git a/folly/portability/PThread.h b/folly/portability/PThread.h
index d1fa23b4bdd..43d1f2fb832 100644
--- a/folly/portability/PThread.h
+++ b/folly/portability/PThread.h
@@ -21,7 +21,9 @@
 #if !defined(_WIN32)
 
 #include <pthread.h>
-
+#if FOLLY_HAVE_PTHREAD_NP
+#include <pthread_np.h>
+#endif
 #elif !FOLLY_HAVE_PTHREAD
 
 #include <cstdint>
diff --git a/folly/system/ThreadId.h b/folly/system/ThreadId.h
index fdced32982b..1eb1ea0c14c 100644
--- a/folly/system/ThreadId.h
+++ b/folly/system/ThreadId.h
@@ -78,10 +78,12 @@ inline uint64_t getCurrentThreadID() {
  * joined.
  */
 inline uint64_t getOSThreadID() {
-#if __APPLE__
+#if __APPLE__ 
   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

From bc9205e462499074531d3e1c69d227b6897ec51a Mon Sep 17 00:00:00 2001
From: Matt Hargett <plaztiksyke@gmail.com>
Date: Mon, 28 Jan 2019 13:34:17 -0800
Subject: [PATCH 02/10] Fix botched merge.

---
 folly/Traits.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/folly/Traits.h b/folly/Traits.h
index 8d7e012ecb4..64eb47d0f02 100644
--- a/folly/Traits.h
+++ b/folly/Traits.h
@@ -424,7 +424,7 @@ namespace traits_detail_IsNothrowSwappable {
 // enabled.
 template <typename T>
 using IsNothrowSwappable = std::is_nothrow_swappable<T>;
-<<<<<<< HEAD
+#elif _CPPLIB_VER > 601
 // 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.

From 87d1135d9a9c5135b22f5b94228286552886c070 Mon Sep 17 00:00:00 2001
From: Matt Hargett <plaztiksyke@gmail.com>
Date: Tue, 29 Jan 2019 17:20:44 -0800
Subject: [PATCH 03/10] Fall back to stdint.h is cstdint (and friends) aren't
 available. Use CPPLIB version to avoid using things that aren't available in
 Dinkumware C++ headers.

---
 folly/FBString.h                |  2 +-
 folly/GLog.h                    | 18 ------------------
 folly/String.cpp                |  3 ++-
 folly/String.h                  |  2 --
 folly/container/SparseByteSet.h |  2 +-
 folly/detail/RangeCommon.h      |  3 +++
 folly/detail/RangeSse42.cpp     |  2 +-
 folly/dynamic-inl.h             |  2 +-
 folly/portability/PThread.h     | 10 +++++++++-
 folly/system/ThreadId.h         |  6 +++++-
 10 files changed, 23 insertions(+), 27 deletions(-)

diff --git a/folly/FBString.h b/folly/FBString.h
index d81468a83c2..84eca96783c 100644
--- a/folly/FBString.h
+++ b/folly/FBString.h
@@ -2796,7 +2796,7 @@ operator<<(
       os.setstate(_ostream_type::badbit | _ostream_type::failbit);
     }
   }
-#elif defined(_MSC_VER) || defined(HAS_NO_OSTREAM_INSERT)
+#elif defined(_MSC_VER) || (_CPPLIB_VER <= 601)
   typedef decltype(os.precision()) streamsize;
   // MSVC doesn't define __ostream_insert
   os.write(str.data(), static_cast<streamsize>(str.size()));
diff --git a/folly/GLog.h b/folly/GLog.h
index 989687d384e..dc94465afff 100644
--- a/folly/GLog.h
+++ b/folly/GLog.h
@@ -16,10 +16,8 @@
 
 #pragma once
 
-#if FOLLY_HAVE_LIBGLOG
 #include <atomic>
 #include <chrono>
-
 #include <glog/logging.h>
 
 #ifndef FB_LOG_EVERY_MS
@@ -58,19 +56,3 @@
           LOG(severity)
 
 #endif
-#else
-#include <iostream>
-#ifndef FB_LOG_EVERY_MS
-#define FB_LOG_EVERY_MS(severity, milli_interval)
-#endif
-#define CHECK(x) std::cerr
-#define CHECK_GE(x,y)
-#define DCHECK_EQ(x,y)
-#define DCHECK_GT(x,y)
-#define DCHECK_LT(x,y)
-#define DCHECK_LE(x,y)
-#define DCHECK(x)
-#define WARNING 0
-#define DFATAL 0
-#define LOG(x) std::cerr
-#endif
diff --git a/folly/String.cpp b/folly/String.cpp
index 81abf5547cf..fd8ae6200e6 100644
--- a/folly/String.cpp
+++ b/folly/String.cpp
@@ -24,7 +24,8 @@
 #include <sstream>
 #include <stdexcept>
 
-#include <folly/GLog.h>
+#include <glog/logging.h>
+
 #include <folly/Portability.h>
 #include <folly/ScopeGuard.h>
 #include <folly/container/Array.h>
diff --git a/folly/String.h b/folly/String.h
index 992d7616eec..46fb6d2ac58 100644
--- a/folly/String.h
+++ b/folly/String.h
@@ -27,8 +27,6 @@
 #include <folly/Conv.h>
 #include <folly/ExceptionString.h>
 #include <folly/FBString.h>
-#include <folly/FBVector.h>
-#include <folly/GLog.h>
 #include <folly/Portability.h>
 #include <folly/Range.h>
 #include <folly/ScopeGuard.h>
diff --git a/folly/container/SparseByteSet.h b/folly/container/SparseByteSet.h
index b5a1e12c572..2bbf7549778 100644
--- a/folly/container/SparseByteSet.h
+++ b/folly/container/SparseByteSet.h
@@ -22,7 +22,7 @@
 #include <stdint.h>
 #endif
 
-#include <folly/GLog.h>
+#include <glog/logging.h>
 
 namespace folly {
 
diff --git a/folly/detail/RangeCommon.h b/folly/detail/RangeCommon.h
index 2bef8cf74f0..6a4321337f6 100644
--- a/folly/detail/RangeCommon.h
+++ b/folly/detail/RangeCommon.h
@@ -19,6 +19,8 @@
 #include <algorithm>
 #include <string>
 
+#include <glog/logging.h>
+
 #include <folly/Likely.h>
 
 namespace folly {
@@ -54,6 +56,7 @@ class StringPieceLite {
     return size() == 0;
   }
   const char& operator[](size_t i) const {
+    DCHECK_GT(size(), i);
     return b_[i];
   }
   template <typename Range>
diff --git a/folly/detail/RangeSse42.cpp b/folly/detail/RangeSse42.cpp
index b8acb1278af..74dac069b6c 100644
--- a/folly/detail/RangeSse42.cpp
+++ b/folly/detail/RangeSse42.cpp
@@ -15,7 +15,7 @@
  */
 
 #include <folly/detail/RangeSse42.h>
-#include <folly/GLog.h>
+#include <glog/logging.h>
 #include <folly/Portability.h>
 
 //  Essentially, two versions of this file: one with an SSE42 implementation
diff --git a/folly/dynamic-inl.h b/folly/dynamic-inl.h
index c6f40db289e..54465ee997b 100644
--- a/folly/dynamic-inl.h
+++ b/folly/dynamic-inl.h
@@ -20,7 +20,7 @@
 #include <folly/CPortability.h>
 #include <folly/Conv.h>
 #include <folly/Format.h>
-#include <folly/GLog.h>
+#include <glog/logging.h>
 #include <folly/Likely.h>
 #include <folly/detail/Iterators.h>
 #include <folly/lang/Exception.h>
diff --git a/folly/portability/PThread.h b/folly/portability/PThread.h
index 43d1f2fb832..3ac99df4e5b 100644
--- a/folly/portability/PThread.h
+++ b/folly/portability/PThread.h
@@ -21,12 +21,20 @@
 #if !defined(_WIN32)
 
 #include <pthread.h>
-#if FOLLY_HAVE_PTHREAD_NP
+
+if __has_include(<pthread_np.h>)
 #include <pthread_np.h>
+#endif
+
 #endif
 #elif !FOLLY_HAVE_PTHREAD
 
+#if __has_include(<cstdint>)
 #include <cstdint>
+#else 
+#include <stdint.h>
+#endif
+
 #include <memory>
 
 #include <folly/portability/Sched.h>
diff --git a/folly/system/ThreadId.h b/folly/system/ThreadId.h
index 1eb1ea0c14c..d1434e01e98 100644
--- a/folly/system/ThreadId.h
+++ b/folly/system/ThreadId.h
@@ -16,7 +16,11 @@
 
 #pragma once
 
+#if __has_include(<cstdint>)
 #include <cstdint>
+#else 
+#include <stdint.h>
+#endif
 
 #include <folly/portability/PThread.h>
 #include <folly/portability/SysSyscall.h>
@@ -78,7 +82,7 @@ inline uint64_t getCurrentThreadID() {
  * joined.
  */
 inline uint64_t getOSThreadID() {
-#if __APPLE__ 
+#if __APPLE__
   uint64_t tid;
   pthread_threadid_np(nullptr, &tid);
   return tid;

From 6f3cc60918a1da464fb907bbf9a39a3148234236 Mon Sep 17 00:00:00 2001
From: Matt Hargett <plaztiksyke@gmail.com>
Date: Wed, 30 Jan 2019 18:12:03 -0800
Subject: [PATCH 04/10] Fix Linux build and test linkage errors.

---
 folly/portability/PThread.h | 3 +--
 folly/system/ThreadId.h     | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/folly/portability/PThread.h b/folly/portability/PThread.h
index 3ac99df4e5b..afc9764ed05 100644
--- a/folly/portability/PThread.h
+++ b/folly/portability/PThread.h
@@ -22,11 +22,10 @@
 
 #include <pthread.h>
 
-if __has_include(<pthread_np.h>)
+#if __has_include(<pthread_np.h>)
 #include <pthread_np.h>
 #endif
 
-#endif
 #elif !FOLLY_HAVE_PTHREAD
 
 #if __has_include(<cstdint>)
diff --git a/folly/system/ThreadId.h b/folly/system/ThreadId.h
index d1434e01e98..61c594bd626 100644
--- a/folly/system/ThreadId.h
+++ b/folly/system/ThreadId.h
@@ -86,7 +86,7 @@ inline uint64_t getOSThreadID() {
   uint64_t tid;
   pthread_threadid_np(nullptr, &tid);
   return tid;
-#elif __has_include(<pthread_np.h>>)
+#elif __has_include(<pthread_np.h>)
   return uint64_t(pthread_getthreadid_np());
 #elif _WIN32
   return uint64_t(GetCurrentThreadId());

From ced617556e1ca95941dfaf0f5c20ecda632eb07c Mon Sep 17 00:00:00 2001
From: Matt Hargett <plaztiksyke@gmail.com>
Date: Thu, 31 Jan 2019 11:25:37 -0800
Subject: [PATCH 05/10] Remove folly-config.h

---
 folly/folly-config.h | 88 --------------------------------------------
 1 file changed, 88 deletions(-)
 delete mode 100644 folly/folly-config.h

diff --git a/folly/folly-config.h b/folly/folly-config.h
deleted file mode 100644
index 4843f60facb..00000000000
--- a/folly/folly-config.h
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * Copyright 2016 Facebook, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#pragma once
-
-#if !defined(FOLLY_MOBILE)
-#if defined(__ANDROID__) || \
-    (defined(__APPLE__) &&  \
-     (TARGET_IPHONE_SIMULATOR || TARGET_OS_SIMULATOR || TARGET_OS_IPHONE))
-#define FOLLY_MOBILE 1
-#else
-#define FOLLY_MOBILE 0
-#endif
-#endif // FOLLY_MOBILE
-
-// ***
-//
-// ***
-#define HAS_NO_OSTREAM_INSERT 1
-
-#define FOLLY_HAVE_PTHREAD 1
-#define FOLLY_HAVE_PTHREAD_ATFORK 0
-
-#define FOLLY_HAVE_LIBGFLAGS 0
-/* #undef FOLLY_UNUSUAL_GFLAGS_NAMESPACE */
-#define FOLLY_GFLAGS_NAMESPACE gflags
-
-#define FOLLY_HAVE_LIBGLOG 0
-
-#define FOLLY_HAVE_MALLOC_H 0
-#define FOLLY_HAVE_BITS_CXXCONFIG_H 1
-#define FOLLY_HAVE_FEATURES_H 0
-#define FOLLY_HAVE_LINUX_MEMBARRIER_H 0
-/* #undef FOLLY_USE_JEMALLOC */
-
-#if FOLLY_HAVE_FEATURES_H
-#include <features.h>
-#endif
-
-#define FOLLY_HAVE_MEMRCHR 0
-#define FOLLY_HAVE_PREADV 1
-#define FOLLY_HAVE_PWRITEV 1
-#define FOLLY_HAVE_CLOCK_GETTIME 0
-/* #undef FOLLY_HAVE_CPLUS_DEMANGLE_V3_CALLBACK */
-#define FOLLY_HAVE_OPENSSL_ASN1_TIME_DIFF 0
-
-#define FOLLY_HAVE_IFUNC 1
-#define FOLLY_HAVE_STD__IS_TRIVIALLY_COPYABLE 1
-#define FOLLY_HAVE_UNALIGNED_ACCESS 1
-#define FOLLY_HAVE_VLA 1
-#define FOLLY_HAVE_WEAK_SYMBOLS 1
-#define FOLLY_HAVE_LINUX_VDSO 0
-#define FOLLY_HAVE_MALLOC_USABLE_SIZE 1
-#define FOLLY_HAVE_INT128_T 0
-/* #undef FOLLY_SUPPLY_MISSING_INT128_TRAITS */
-#define FOLLY_HAVE_WCHAR_SUPPORT 1
-#define FOLLY_HAVE_EXTRANDOM_SFMT19937 0
-#define FOLLY_USE_LIBCPP 0
-#define FOLLY_HAVE_XSI_STRERROR_R 1
-#define HAVE_VSNPRINTF_ERRORS 1
-
-/* #undef FOLLY_HAVE_LIBDWARF_DWARF_H */
-/* #undef FOLLY_USE_SYMBOLIZER */
-#define FOLLY_DEMANGLE_MAX_SYMBOL_SIZE 1024
-
-#define FOLLY_HAVE_SHADOW_LOCAL_WARNINGS 0
-
-/* #undef FOLLY_HAVE_LIBLZ4 */
-/* #undef FOLLY_HAVE_LIBLZMA */
-/* #undef FOLLY_HAVE_LIBSNAPPY */
-#define FOLLY_HAVE_LIBZ 0
-/* #undef FOLLY_HAVE_LIBZSTD */
-/* #undef FOLLY_HAVE_LIBBZ2 */
-
-/* #undef FOLLY_SUPPORT_SHARED_LIBRARY */

From 4faea92c2f16c1aa832ea2bbd33f4d398a026caa Mon Sep 17 00:00:00 2001
From: Matt Hargett <plaztiksyke@gmail.com>
Date: Mon, 25 Feb 2019 14:59:20 -0800
Subject: [PATCH 06/10] After upgrading to newer Dinkumare, was able to remove
 many header-level workarounds. yay!

---
 folly/ExceptionWrapper.h        | 4 ----
 folly/FBString.h                | 2 +-
 folly/GLog.h                    | 1 +
 folly/String.cpp                | 2 +-
 folly/Traits.h                  | 2 +-
 folly/Utility.h                 | 4 ----
 folly/container/SparseByteSet.h | 4 ----
 folly/detail/Futex.h            | 6 +-----
 folly/detail/RangeSse42.cpp     | 2 ++
 folly/dynamic.h                 | 4 ----
 folly/hash/Hash.h               | 8 --------
 folly/hash/SpookyHashV1.h       | 4 ----
 folly/hash/SpookyHashV2.h       | 4 ----
 folly/lang/Bits.h               | 8 --------
 folly/portability/PThread.h     | 5 -----
 folly/system/ThreadId.h         | 4 ----
 16 files changed, 7 insertions(+), 57 deletions(-)

diff --git a/folly/ExceptionWrapper.h b/folly/ExceptionWrapper.h
index 8266a953ee9..c4e694ef4a3 100644
--- a/folly/ExceptionWrapper.h
+++ b/folly/ExceptionWrapper.h
@@ -20,11 +20,7 @@
 #pragma once
 
 #include <cassert>
-#if __has_include(<cstdint>) 
 #include <cstdint>
-#else 
-#include <stdint.h>
-#endif
 #include <exception>
 #include <iosfwd>
 #include <memory>
diff --git a/folly/FBString.h b/folly/FBString.h
index 84eca96783c..19d7aeec8ef 100644
--- a/folly/FBString.h
+++ b/folly/FBString.h
@@ -2796,7 +2796,7 @@ operator<<(
       os.setstate(_ostream_type::badbit | _ostream_type::failbit);
     }
   }
-#elif defined(_MSC_VER) || (_CPPLIB_VER <= 601)
+#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()));
diff --git a/folly/GLog.h b/folly/GLog.h
index dc94465afff..3724aaa59a4 100644
--- a/folly/GLog.h
+++ b/folly/GLog.h
@@ -18,6 +18,7 @@
 
 #include <atomic>
 #include <chrono>
+
 #include <glog/logging.h>
 
 #ifndef FB_LOG_EVERY_MS
diff --git a/folly/String.cpp b/folly/String.cpp
index fd8ae6200e6..f18b9f934cf 100644
--- a/folly/String.cpp
+++ b/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) {
diff --git a/folly/Traits.h b/folly/Traits.h
index 98ee1e60c06..6f08b19a90b 100644
--- a/folly/Traits.h
+++ b/folly/Traits.h
@@ -434,7 +434,7 @@ namespace traits_detail_IsNothrowSwappable {
 // enabled.
 template <typename T>
 using IsNothrowSwappable = std::is_nothrow_swappable<T>;
-#elif _CPPLIB_VER > 601
+#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.
diff --git a/folly/Utility.h b/folly/Utility.h
index 46cae9a3448..3fe8ac0193a 100644
--- a/folly/Utility.h
+++ b/folly/Utility.h
@@ -16,11 +16,7 @@
 
 #pragma once
 
-#if __has_include(<cstdint>) 
 #include <cstdint>
-#else 
-#include <stdint.h>
-#endif
 #include <limits>
 #include <type_traits>
 #include <utility>
diff --git a/folly/container/SparseByteSet.h b/folly/container/SparseByteSet.h
index 2bbf7549778..717fa2d33bf 100644
--- a/folly/container/SparseByteSet.h
+++ b/folly/container/SparseByteSet.h
@@ -16,11 +16,7 @@
 
 #pragma once
 
-#if __has_include(<cstdint>)
 #include <cstdint>
-#else 
-#include <stdint.h>
-#endif
 
 #include <glog/logging.h>
 
diff --git a/folly/detail/Futex.h b/folly/detail/Futex.h
index 760ed62766b..71fa98024be 100644
--- a/folly/detail/Futex.h
+++ b/folly/detail/Futex.h
@@ -19,11 +19,7 @@
 #include <atomic>
 #include <cassert>
 #include <chrono>
-#if __has_include(<cstdint>) 
 #include <cstdint>
-#else 
-#include <stdint.h>
-#endif
 #include <limits>
 #include <type_traits>
 
@@ -52,7 +48,7 @@ enum class FutexResult {
  * functions are available as free functions rather than member functions
  */
 template <template <typename> class Atom = std::atomic>
-using Futex = Atom<::uint32_t>;
+using Futex = Atom<std::uint32_t>;
 
 /**
  * Puts the thread to sleep if this->load() == expected.  Returns true when
diff --git a/folly/detail/RangeSse42.cpp b/folly/detail/RangeSse42.cpp
index 74dac069b6c..b0f551f8247 100644
--- a/folly/detail/RangeSse42.cpp
+++ b/folly/detail/RangeSse42.cpp
@@ -15,7 +15,9 @@
  */
 
 #include <folly/detail/RangeSse42.h>
+
 #include <glog/logging.h>
+
 #include <folly/Portability.h>
 
 //  Essentially, two versions of this file: one with an SSE42 implementation
diff --git a/folly/dynamic.h b/folly/dynamic.h
index 2e5da237482..f5ec96ad075 100644
--- a/folly/dynamic.h
+++ b/folly/dynamic.h
@@ -52,11 +52,7 @@
 
 #pragma once
 
-#if __has_include(<cstdint>) 
 #include <cstdint>
-#else 
-#include <stdint.h>
-#endif
 #include <memory>
 #include <ostream>
 #include <string>
diff --git a/folly/hash/Hash.h b/folly/hash/Hash.h
index 924a31914ad..3177e9c4362 100644
--- a/folly/hash/Hash.h
+++ b/folly/hash/Hash.h
@@ -16,16 +16,8 @@
 
 #pragma once
 
-#if __has_include(<cstdint>) 
 #include <cstdint>
-#else 
-#include <stdint.h>
-#endif
-#if __has_include(<cstring>) 
 #include <cstring>
-#else
-#include <string.h>
-#endif
 #include <limits>
 #include <string>
 #include <tuple>
diff --git a/folly/hash/SpookyHashV1.h b/folly/hash/SpookyHashV1.h
index e218ab25eb8..184e077eca9 100644
--- a/folly/hash/SpookyHashV1.h
+++ b/folly/hash/SpookyHashV1.h
@@ -45,11 +45,7 @@
 #pragma once
 
 #include <cstddef>
-#if __has_include(<cstdint>) 
 #include <cstdint>
-#else 
-#include <stdint.h>
-#endif
 
 namespace folly {
 namespace hash {
diff --git a/folly/hash/SpookyHashV2.h b/folly/hash/SpookyHashV2.h
index f72017fea5f..f4431a6ef0b 100644
--- a/folly/hash/SpookyHashV2.h
+++ b/folly/hash/SpookyHashV2.h
@@ -46,11 +46,7 @@
 #pragma once
 
 #include <cstddef>
-#if __has_include(<cstdint>) 
 #include <cstdint>
-#else 
-#include <stdint.h>
-#endif
 
 namespace folly {
 namespace hash {
diff --git a/folly/lang/Bits.h b/folly/lang/Bits.h
index e2484752ccb..8ea562e4e94 100644
--- a/folly/lang/Bits.h
+++ b/folly/lang/Bits.h
@@ -47,16 +47,8 @@
 #pragma once
 
 #include <cassert>
-#if __has_include(<cinttypes>) 
 #include <cinttypes>
-#else 
-#include <inttypes.h>
-#endif
-#if __has_include(<cstdint>) 
 #include <cstdint>
-#else 
-#include <stdint.h>
-#endif
 #include <cstring>
 #include <limits>
 #include <type_traits>
diff --git a/folly/portability/PThread.h b/folly/portability/PThread.h
index afc9764ed05..72877ef76fb 100644
--- a/folly/portability/PThread.h
+++ b/folly/portability/PThread.h
@@ -28,12 +28,7 @@
 
 #elif !FOLLY_HAVE_PTHREAD
 
-#if __has_include(<cstdint>)
 #include <cstdint>
-#else 
-#include <stdint.h>
-#endif
-
 #include <memory>
 
 #include <folly/portability/Sched.h>
diff --git a/folly/system/ThreadId.h b/folly/system/ThreadId.h
index 61c594bd626..acad9515556 100644
--- a/folly/system/ThreadId.h
+++ b/folly/system/ThreadId.h
@@ -16,11 +16,7 @@
 
 #pragma once
 
-#if __has_include(<cstdint>)
 #include <cstdint>
-#else 
-#include <stdint.h>
-#endif
 
 #include <folly/portability/PThread.h>
 #include <folly/portability/SysSyscall.h>

From c3dbbfb9af89d5b5b23c94c1390041c10ffd013a Mon Sep 17 00:00:00 2001
From: Matt Hargett <plaztiksyke@gmail.com>
Date: Tue, 26 Feb 2019 16:00:35 -0800
Subject: [PATCH 07/10] Cleanup based on feedback and newer Dinkumware/FreeBSD
 headers.

---
 folly/Portability.h         | 4 +---
 folly/portability/PThread.h | 4 ----
 folly/system/ThreadId.h     | 4 ++++
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/folly/Portability.h b/folly/Portability.h
index 9910736a925..934724aa2d2 100644
--- a/folly/Portability.h
+++ b/folly/Portability.h
@@ -205,10 +205,8 @@ FOLLY_GCC_DISABLE_NEW_SHADOW_WARNINGS
  */
 #if defined(_MSC_VER)
 #define FOLLY_TLS __declspec(thread)
-#elif (defined(__GNUC__) || defined(__clang__)) && !_LIBCPP_VER 
+#elif (defined(__GNUC__) || defined(__clang__))
 #define FOLLY_TLS __thread
-#elif (defined(__GNUC__) || defined(__clang__)) && _LIBCPP_VER 
-#define FOLLY_TLS thread_local
 #else
 #error cannot define platform specific thread local storage
 #endif
diff --git a/folly/portability/PThread.h b/folly/portability/PThread.h
index 72877ef76fb..d1fa23b4bdd 100644
--- a/folly/portability/PThread.h
+++ b/folly/portability/PThread.h
@@ -22,10 +22,6 @@
 
 #include <pthread.h>
 
-#if __has_include(<pthread_np.h>)
-#include <pthread_np.h>
-#endif
-
 #elif !FOLLY_HAVE_PTHREAD
 
 #include <cstdint>
diff --git a/folly/system/ThreadId.h b/folly/system/ThreadId.h
index acad9515556..ed47c80ae24 100644
--- a/folly/system/ThreadId.h
+++ b/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 {
 
 /**

From 602575740c083160199880f8ddae8ede61eb88d2 Mon Sep 17 00:00:00 2001
From: Matt Hargett <plaztiksyke@gmail.com>
Date: Wed, 27 Feb 2019 18:23:01 -0800
Subject: [PATCH 08/10] Minor changes based on feedback for consistency.

---
 folly/Conv.h               | 1 -
 folly/FBString.h           | 4 ++--
 folly/Portability.h        | 4 +---
 folly/String.cpp           | 2 +-
 folly/Traits.h             | 8 ++++----
 folly/dynamic-inl.h        | 1 -
 folly/memory/Malloc.h      | 2 +-
 folly/portability/Malloc.h | 2 +-
 folly/system/ThreadId.h    | 6 +++---
 9 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/folly/Conv.h b/folly/Conv.h
index eada898c9ca..fb4bf7b1a83 100644
--- a/folly/Conv.h
+++ b/folly/Conv.h
@@ -39,7 +39,6 @@
 #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>
diff --git a/folly/FBString.h b/folly/FBString.h
index 19d7aeec8ef..5102fdef2f1 100644
--- a/folly/FBString.h
+++ b/folly/FBString.h
@@ -2796,9 +2796,9 @@ operator<<(
       os.setstate(_ostream_type::badbit | _ostream_type::failbit);
     }
   }
-#elif defined(_MSC_VER) || (_CPPLIB_VER <= 800)
+#elif defined(_MSC_VER) || defined(_CPPLIB_VER)
+  // MSVC nor Dinkumware headers  define __ostream_insert
   typedef decltype(os.precision()) streamsize;
-  // MSVC doesn't define __ostream_insert
   os.write(str.data(), static_cast<streamsize>(str.size()));
 #else
   std::__ostream_insert(os, str.data(), str.size());
diff --git a/folly/Portability.h b/folly/Portability.h
index 934724aa2d2..a97fbbed18c 100644
--- a/folly/Portability.h
+++ b/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,9 +219,7 @@ 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
diff --git a/folly/String.cpp b/folly/String.cpp
index f18b9f934cf..fd8ae6200e6 100644
--- a/folly/String.cpp
+++ b/folly/String.cpp
@@ -487,7 +487,7 @@ fbstring errnoStr(int err) {
 #elif FOLLY_HAVE_XSI_STRERROR_R || defined(__APPLE__)
 
   // Using XSI-compatible strerror_r
-  auto r = strerror_r(err, buf, sizeof(buf));
+  int r = strerror_r(err, buf, sizeof(buf));
 
   // OSX/FreeBSD use EINVAL and Linux uses -1 so just check for non-zero
   if (r != 0) {
diff --git a/folly/Traits.h b/folly/Traits.h
index 5643eaf8c13..99d3392f68d 100644
--- a/folly/Traits.h
+++ b/folly/Traits.h
@@ -428,15 +428,15 @@ struct IsLessThanComparable
     IsLessThanComparable;
 
 namespace traits_detail_IsNothrowSwappable {
-#if defined(__cpp_lib_is_swappable) || (_CPPLIB_VER && _HAS_CXX17)
+#if defined(__cpp_lib_is_swappable) || (_CPPLIB_VER && (_HAS_CPP17 || _HAS_CXX17))
 // MSVC already implements the C++17 P0185R1 proposal which adds
 // std::is_nothrow_swappable, so use it instead if C++17 mode is
 // enabled.
 template <typename T>
 using IsNothrowSwappable = std::is_nothrow_swappable<T>;
-#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
+#elif _MSC_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.
 template <typename T>
 using IsNothrowSwappable = std::_Is_nothrow_swappable<T>;
diff --git a/folly/dynamic-inl.h b/folly/dynamic-inl.h
index 54465ee997b..2b3b2a49916 100644
--- a/folly/dynamic-inl.h
+++ b/folly/dynamic-inl.h
@@ -20,7 +20,6 @@
 #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>
diff --git a/folly/memory/Malloc.h b/folly/memory/Malloc.h
index 3892f2778fb..b99740e4936 100644
--- a/folly/memory/Malloc.h
+++ b/folly/memory/Malloc.h
@@ -96,7 +96,7 @@ 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 and it errors when including malloc.h.
-#if __has_include(<malloc.h>) && !defined(__STDC__)
+#if __has_include(<malloc.h>) && (!defined(__STDC__) || !__STDC__)
 #include <malloc.h>
 #else
 #include <stdlib.h>
diff --git a/folly/portability/Malloc.h b/folly/portability/Malloc.h
index f23ca974be3..177cb4bc0b4 100644
--- a/folly/portability/Malloc.h
+++ b/folly/portability/Malloc.h
@@ -26,7 +26,7 @@
 // malloc_usable_size, and that's what we should be using.
 #include <jemalloc/jemalloc.h>
 #else
-#if !defined(__APPLE__) && !defined(__STDC__)
+#if !defined(__APPLE__) && (!defined(__STDC__) || !__STDC__)
 #include <malloc.h>
 #endif
 
diff --git a/folly/system/ThreadId.h b/folly/system/ThreadId.h
index ed47c80ae24..148b5a11552 100644
--- a/folly/system/ThreadId.h
+++ b/folly/system/ThreadId.h
@@ -86,12 +86,12 @@ 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
+#elif __linux__
   return uint64_t(syscall(FOLLY_SYS_gettid));
+#else
+  return uint64_t(pthread_getthreadid_np());
 #endif
 }
 } // namespace folly

From 24314271765f8041c6e29dc9eddc8d2ca08dafa0 Mon Sep 17 00:00:00 2001
From: Matt Hargett <plaztiksyke@gmail.com>
Date: Tue, 26 Mar 2019 09:23:42 -0700
Subject: [PATCH 09/10] Add explicit header check and error out if no platform
 checks are true.

---
 folly/system/ThreadId.h | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/folly/system/ThreadId.h b/folly/system/ThreadId.h
index 148b5a11552..b7b232a4c12 100644
--- a/folly/system/ThreadId.h
+++ b/folly/system/ThreadId.h
@@ -90,8 +90,10 @@ inline uint64_t getOSThreadID() {
   return uint64_t(GetCurrentThreadId());
 #elif __linux__
   return uint64_t(syscall(FOLLY_SYS_gettid));
-#else
+#elif __has_include(<pthread_np.h>)
   return uint64_t(pthread_getthreadid_np());
+#else
+#error Cannot define platform-specific get Thread ID.
 #endif
 }
 } // namespace folly

From b560eb66ecbe5523d0f44dca02875ca1dcd82c07 Mon Sep 17 00:00:00 2001
From: Matt Hargett <plaztiksyke@gmail.com>
Date: Tue, 26 Mar 2019 09:41:14 -0700
Subject: [PATCH 10/10] Master added some DCHECK macros without adding explicit
 includes where they were used. Added explicit glog/logging.h include to the
 top of the relevant files, to match the style in
 folly/detail/IPAddressSource.h

---
 folly/SingletonThreadLocal.h     | 2 +-
 folly/ThreadLocal.h              | 1 +
 folly/detail/ThreadLocalDetail.h | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/folly/SingletonThreadLocal.h b/folly/SingletonThreadLocal.h
index 3eadb1a4239..a5d639ff24c 100644
--- a/folly/SingletonThreadLocal.h
+++ b/folly/SingletonThreadLocal.h
@@ -16,10 +16,10 @@
 
 #pragma once
 
+#include <glog/logging.h>
 #include <typeinfo>
 
 #include <boost/intrusive/list.hpp>
-
 #include <folly/ScopeGuard.h>
 #include <folly/ThreadLocal.h>
 #include <folly/detail/Iterators.h>
diff --git a/folly/ThreadLocal.h b/folly/ThreadLocal.h
index ca8fa30c448..05d2a875ec3 100644
--- a/folly/ThreadLocal.h
+++ b/folly/ThreadLocal.h
@@ -40,6 +40,7 @@
 
 #pragma once
 
+#include<glog/logging.h>
 #include <iterator>
 #include <type_traits>
 #include <utility>
diff --git a/folly/detail/ThreadLocalDetail.h b/folly/detail/ThreadLocalDetail.h
index 1fa6b1dadf2..148e564a541 100644
--- a/folly/detail/ThreadLocalDetail.h
+++ b/folly/detail/ThreadLocalDetail.h
@@ -18,6 +18,7 @@
 
 #include <limits.h>
 
+#include <glog/logging.h>
 #include <atomic>
 #include <functional>
 #include <mutex>