3 files changed, 1 insertions, 10 deletions
diff --git a/src/mongo/db/concurrency/lock_state.cpp b/src/mongo/db/concurrency/lock_state.cpp
index 4995437c533..e53a2e955b7 100644
--- a/src/mongo/db/concurrency/lock_state.cpp
+++ b/src/mongo/db/concurrency/lock_state.cpp
@@ -54,7 +54,6 @@
 
 #define MONGO_LOGV2_DEFAULT_COMPONENT ::mongo::logv2::LogComponent::kDefault
 
-
 namespace mongo {
 
 MONGO_FAIL_POINT_DEFINE(failNonIntentLocksIfWaitNeeded);
@@ -65,7 +64,7 @@ namespace {
 // Ignore data races in certain functions when running with TSAN. For performance reasons,
 // diagnostic commands are expected to race with concurrent lock acquisitions while gathering
 // statistics.
-#if defined(__has_feature) && __has_feature(thread_sanitizer)
+#if __has_feature(thread_sanitizer)
 #define MONGO_TSAN_IGNORE __attribute__((no_sanitize("thread")))
 #else
 #define MONGO_TSAN_IGNORE
diff --git a/src/mongo/db/mongod_main.cpp b/src/mongo/db/mongod_main.cpp
index 589ad967da8..8a8e057a8b4 100644
--- a/src/mongo/db/mongod_main.cpp
+++ b/src/mongo/db/mongod_main.cpp
@@ -1333,10 +1333,6 @@ MONGO_INITIALIZER_GENERAL(setSSLManagerType, (), ("SSLManager"))
 }
 #endif
 
-#if !defined(__has_feature)
-#define __has_feature(x) 0
-#endif
-
 // NOTE: This function may be called at any time after registerShutdownTask is called below. It
 // must not depend on the prior execution of mongo initializers or the existence of threads.
 void shutdownTask(const ShutdownTaskArgs& shutdownArgs) {
diff --git a/src/mongo/db/storage/wiredtiger/wiredtiger_kv_engine.cpp b/src/mongo/db/storage/wiredtiger/wiredtiger_kv_engine.cpp
index 2fefa77da8a..b9739ac8d3a 100644
--- a/src/mongo/db/storage/wiredtiger/wiredtiger_kv_engine.cpp
+++ b/src/mongo/db/storage/wiredtiger/wiredtiger_kv_engine.cpp
@@ -129,10 +129,6 @@ MONGO_FAIL_POINT_DEFINE(WTDisableFastShutDown);
 
 const std::string kPinOldestTimestampAtStartupName = "_wt_startup";
 
-#if !defined(__has_feature)
-#define __has_feature(x) 0
-#endif
-
 #if __has_feature(address_sanitizer)
 constexpr bool kAddressSanitizerEnabled = true;
 #else