Merge #281: cmake: Port PR30519 from the master branch

c814a1c fixup! ci: Migrate CI scripts to CMake (fanquake) 3de63c7 refactor: fix missing includes (fanquake) Pull request description: This PR ports bitcoin#30519. Top commit has no ACKs. Tree-SHA512: ac9198e5065a08ae23f3dfcf7dfbb9c6f9c4b2f2345992141c88c232aa37da929ebb4a9c9405bf47d1fbd517e9aae4feb6c9220e036c0a04b26c5096f2cb09ba
hebasto · Jul 25, 2024 · 52829c3 · 52829c3
2 parents dc490da + c814a1c
commit 52829c3
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/ci/test/00_setup_env_native_tsan.sh b/ci/test/00_setup_env_native_tsan.sh
@@ -12,4 +12,4 @@ export PACKAGES="clang-18 llvm-18 libclang-rt-18-dev libc++abi-18-dev libc++-18-
 export DEP_OPTS="CC=clang-18 CXX='clang++-18 -stdlib=libc++'"
 export GOAL="install"
 export BITCOIN_CONFIG="-DWITH_ZMQ=ON -DSANITIZERS=thread \
--DAPPEND_CPPFLAGS='-DARENA_DEBUG -DDEBUG_LOCKORDER -DDEBUG_LOCKCONTENTION'"
+-DAPPEND_CPPFLAGS='-DARENA_DEBUG -DDEBUG_LOCKORDER -DDEBUG_LOCKCONTENTION -D_LIBCPP_REMOVE_TRANSITIVE_INCLUDES'"
diff --git a/src/crypto/sha256.cpp b/src/crypto/sha256.cpp
@@ -7,8 +7,9 @@
 #include <crypto/sha256.h>
 #include <crypto/common.h>
 
-#include <assert.h>
-#include <string.h>
+#include <algorithm>
+#include <cassert>
+#include <cstring>
 
 #if !defined(DISABLE_OPTIMIZED_SHA256)
 #include <compat/cpuid.h>

diff --git a/src/init.h b/src/init.h
@@ -6,9 +6,7 @@
 #ifndef BITCOIN_INIT_H
 #define BITCOIN_INIT_H
 
-#include <any>
-#include <memory>
-#include <string>
+#include <atomic>
 
 //! Default value for -daemon option
 static constexpr bool DEFAULT_DAEMON = false;