diff --git a/src/coreclr/hosts/corerun/CMakeLists.txt b/src/coreclr/hosts/corerun/CMakeLists.txt index 347c8360ce098b..c9e259d32165ed 100644 --- a/src/coreclr/hosts/corerun/CMakeLists.txt +++ b/src/coreclr/hosts/corerun/CMakeLists.txt @@ -14,7 +14,7 @@ set(CLR_CMAKE_KEEP_NATIVE_SYMBOLS TRUE) add_executable_clr(corerun corerun.cpp dotenv.cpp - ${CLR_SRC_NATIVE_DIR}/minipal/is_native_debugger_present.c + ${CLR_SRC_NATIVE_DIR}/minipal/debugger.c native.rc ) diff --git a/src/coreclr/hosts/corerun/corerun.hpp b/src/coreclr/hosts/corerun/corerun.hpp index 98184fe1aa502d..b312f24404f333 100644 --- a/src/coreclr/hosts/corerun/corerun.hpp +++ b/src/coreclr/hosts/corerun/corerun.hpp @@ -49,7 +49,7 @@ namespace pal #ifdef TARGET_WINDOWS #define CDECL __cdecl #include -#include +#include #define DLL_EXPORT __declspec(dllexport) #define MAIN __cdecl wmain diff --git a/src/coreclr/jit/error.h b/src/coreclr/jit/error.h index d7875de2bfb694..7eb8906f0ff7db 100644 --- a/src/coreclr/jit/error.h +++ b/src/coreclr/jit/error.h @@ -9,7 +9,7 @@ #include // for CORJIT_INTERNALERROR #include // For FitsIn, used by SafeCvt methods. -#include +#include #define FATAL_JIT_EXCEPTION 0x02345678 class Compiler; diff --git a/src/coreclr/minipal/Unix/CMakeLists.txt b/src/coreclr/minipal/Unix/CMakeLists.txt index f5b41598a5131e..e273b12091308b 100644 --- a/src/coreclr/minipal/Unix/CMakeLists.txt +++ b/src/coreclr/minipal/Unix/CMakeLists.txt @@ -1,7 +1,7 @@ set(SOURCES doublemapping.cpp dn-u16.cpp - ${CLR_SRC_NATIVE_DIR}/minipal/is_native_debugger_present.c + ${CLR_SRC_NATIVE_DIR}/minipal/debugger.c ${CLR_SRC_NATIVE_DIR}/minipal/time.c ) diff --git a/src/coreclr/minipal/Windows/CMakeLists.txt b/src/coreclr/minipal/Windows/CMakeLists.txt index aebef1eed570a3..20805efe5d513b 100644 --- a/src/coreclr/minipal/Windows/CMakeLists.txt +++ b/src/coreclr/minipal/Windows/CMakeLists.txt @@ -1,7 +1,7 @@ set(SOURCES doublemapping.cpp dn-u16.cpp - ${CLR_SRC_NATIVE_DIR}/minipal/is_native_debugger_present.c + ${CLR_SRC_NATIVE_DIR}/minipal/debugger.c ${CLR_SRC_NATIVE_DIR}/minipal/utf8.c ${CLR_SRC_NATIVE_DIR}/minipal/time.c ) diff --git a/src/coreclr/nativeaot/Runtime/CMakeLists.txt b/src/coreclr/nativeaot/Runtime/CMakeLists.txt index 408311c69e0374..57d0acd98300a4 100644 --- a/src/coreclr/nativeaot/Runtime/CMakeLists.txt +++ b/src/coreclr/nativeaot/Runtime/CMakeLists.txt @@ -51,7 +51,7 @@ set(COMMON_RUNTIME_SOURCES ${GC_DIR}/softwarewritewatch.cpp ${CLR_SRC_NATIVE_DIR}/minipal/cpufeatures.c - ${CLR_SRC_NATIVE_DIR}/minipal/is_native_debugger_present.c + ${CLR_SRC_NATIVE_DIR}/minipal/debugger.c ${CLR_SRC_NATIVE_DIR}/minipal/time.c ) diff --git a/src/coreclr/nativeaot/Runtime/MiscHelpers.cpp b/src/coreclr/nativeaot/Runtime/MiscHelpers.cpp index ac152261f007c2..7b5040284eab16 100644 --- a/src/coreclr/nativeaot/Runtime/MiscHelpers.cpp +++ b/src/coreclr/nativeaot/Runtime/MiscHelpers.cpp @@ -36,7 +36,7 @@ #include "yieldprocessornormalized.h" #include "RhConfig.h" #include -#include +#include FCIMPL0(void, RhDebugBreak) { diff --git a/src/coreclr/nativeaot/Runtime/rhassert.cpp b/src/coreclr/nativeaot/Runtime/rhassert.cpp index 78a7be4acd729e..970a0b025700da 100644 --- a/src/coreclr/nativeaot/Runtime/rhassert.cpp +++ b/src/coreclr/nativeaot/Runtime/rhassert.cpp @@ -7,7 +7,7 @@ #include "PalRedhawk.h" #include "rhassert.h" -#include +#include #ifdef _DEBUG diff --git a/src/coreclr/pal/src/CMakeLists.txt b/src/coreclr/pal/src/CMakeLists.txt index 3ca7a86242275b..40df255ce17501 100644 --- a/src/coreclr/pal/src/CMakeLists.txt +++ b/src/coreclr/pal/src/CMakeLists.txt @@ -252,8 +252,8 @@ if(CLR_CMAKE_TARGET_LINUX) add_library(tracepointprovider OBJECT misc/tracepointprovider.cpp) endif(CLR_CMAKE_TARGET_LINUX) -add_library(is_native_debugger_present STATIC ${CLR_SRC_NATIVE_DIR}/minipal/is_native_debugger_present.c) -target_link_libraries(coreclrpal PRIVATE is_native_debugger_present) +add_library(minipal_debugger STATIC ${CLR_SRC_NATIVE_DIR}/minipal/debugger.c) +target_link_libraries(coreclrpal PRIVATE minipal_debugger) if(CLR_CMAKE_TARGET_OSX) find_library(COREFOUNDATION CoreFoundation) diff --git a/src/coreclr/pal/src/exception/machexception.cpp b/src/coreclr/pal/src/exception/machexception.cpp index 18ae3e95355ef2..ee7e8d37aed025 100644 --- a/src/coreclr/pal/src/exception/machexception.cpp +++ b/src/coreclr/pal/src/exception/machexception.cpp @@ -32,7 +32,7 @@ SET_DEFAULT_DEBUG_CHANNEL(EXCEPT); // some headers have code with asserts, so do #include "pal/map.hpp" #include "pal/environ.h" -#include +#include #include #include "machmessage.h" diff --git a/src/coreclr/tools/superpmi/superpmi-shared/spmiutil.cpp b/src/coreclr/tools/superpmi/superpmi-shared/spmiutil.cpp index a30468797f3866..fae4cea68159b6 100644 --- a/src/coreclr/tools/superpmi/superpmi-shared/spmiutil.cpp +++ b/src/coreclr/tools/superpmi/superpmi-shared/spmiutil.cpp @@ -9,7 +9,7 @@ #include "logging.h" #include "spmiutil.h" -#include +#include static bool breakOnDebugBreakorAV = false; diff --git a/src/coreclr/utilcode/check.cpp b/src/coreclr/utilcode/check.cpp index b6f41c74d1e9db..2d584d895d2378 100644 --- a/src/coreclr/utilcode/check.cpp +++ b/src/coreclr/utilcode/check.cpp @@ -11,7 +11,7 @@ #include #include -#include +#include #ifdef _DEBUG size_t CHECK::s_cLeakedBytes = 0; diff --git a/src/coreclr/utilcode/debug.cpp b/src/coreclr/utilcode/debug.cpp index 0493f025150dad..9e56bebac348ba 100644 --- a/src/coreclr/utilcode/debug.cpp +++ b/src/coreclr/utilcode/debug.cpp @@ -12,7 +12,7 @@ #include "ex.h" #include "corexcep.h" -#include +#include #ifdef _DEBUG #define LOGGING diff --git a/src/coreclr/vm/eeconfig.h b/src/coreclr/vm/eeconfig.h index 77f2d1f16d5b5a..1f66a86fec1269 100644 --- a/src/coreclr/vm/eeconfig.h +++ b/src/coreclr/vm/eeconfig.h @@ -13,7 +13,7 @@ class MethodDesc; #include "shash.h" #include "corhost.h" -#include +#include #ifdef _DEBUG class TypeNamesList diff --git a/src/mono/mono/mini/calls.c b/src/mono/mono/mini/calls.c index 486ccf17ef7ce6..f150bc4d308174 100644 --- a/src/mono/mono/mini/calls.c +++ b/src/mono/mono/mini/calls.c @@ -4,7 +4,7 @@ #include #include -#include +#include #ifndef DISABLE_JIT diff --git a/src/mono/mono/utils/CMakeLists.txt b/src/mono/mono/utils/CMakeLists.txt index b2f2dd16a0ea56..36277972ab9868 100644 --- a/src/mono/mono/utils/CMakeLists.txt +++ b/src/mono/mono/utils/CMakeLists.txt @@ -177,7 +177,7 @@ set(utils_common_sources wasm-module-reader.c mono-bitutils.h mono-bitutils.c - ${CLR_SRC_NATIVE_DIR}/minipal/is_native_debugger_present.c + ${CLR_SRC_NATIVE_DIR}/minipal/debugger.c ) if(MONO_CROSS_COMPILE) diff --git a/src/native/minipal/is_native_debugger_present.c b/src/native/minipal/debugger.c similarity index 100% rename from src/native/minipal/is_native_debugger_present.c rename to src/native/minipal/debugger.c diff --git a/src/native/minipal/is_native_debugger_present.h b/src/native/minipal/debugger.h similarity index 100% rename from src/native/minipal/is_native_debugger_present.h rename to src/native/minipal/debugger.h