diff options
author | Edward Thomson <ethomson@edwardthomson.com> | 2020-07-12 18:43:22 +0100 |
---|---|---|
committer | Edward Thomson <ethomson@edwardthomson.com> | 2020-11-21 21:54:13 +0000 |
commit | 8aed4629b13a5335c0d84792a61c303274f1e09c (patch) | |
tree | 432e59472be6bba687c3413cd6736b2ae0a43eee | |
parent | 51825c4f39af069d413fdb6cc661e53c4b63ad47 (diff) | |
download | libgit2-8aed4629b13a5335c0d84792a61c303274f1e09c.tar.gz |
cmake: rename MSVC_CRTDBG to WIN32_LEAKCHECK
-rw-r--r-- | CMakeLists.txt | 8 | ||||
-rw-r--r-- | docs/changelog.md | 4 | ||||
-rw-r--r-- | src/alloc.c | 2 | ||||
-rw-r--r-- | src/allocators/win32_leakcheck.c | 2 | ||||
-rw-r--r-- | src/features.h.in | 2 | ||||
-rw-r--r-- | src/win32/w32_leakcheck.c | 2 | ||||
-rw-r--r-- | src/win32/w32_leakcheck.h | 2 | ||||
-rw-r--r-- | tests/clar_libgit2_trace.c | 4 | ||||
-rw-r--r-- | tests/trace/windows/stacktrace.c | 10 |
9 files changed, 20 insertions, 16 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index b6f23cf6b..05ad1baec 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -89,8 +89,8 @@ IF(WIN32) ENDIF() IF(MSVC) - # Enable MSVC CRTDBG memory leak reporting when in debug mode. - OPTION(MSVC_CRTDBG "Enable CRTDBG memory leak reporting" OFF) + # Enable leak checking using the debugging C runtime. + OPTION(WIN32_LEAKCHECK "Enable leak reporting via crtdbg" OFF) ENDIF() IF (DEPRECATE_HARD) @@ -129,8 +129,8 @@ IF (MSVC) SET(CRT_FLAG_RELEASE "/MD") ENDIF() - IF (MSVC_CRTDBG) - SET(GIT_MSVC_CRTDBG 1) + IF (WIN32_LEAKCHECK) + SET(GIT_WIN32_LEAKCHECK 1) SET(CRT_FLAG_DEBUG "${CRT_FLAG_DEBUG}") SET(CMAKE_C_STANDARD_LIBRARIES "${CMAKE_C_STANDARD_LIBRARIES} Dbghelp.lib") ENDIF() diff --git a/docs/changelog.md b/docs/changelog.md index 98bde2f6c..edd2c3f42 100644 --- a/docs/changelog.md +++ b/docs/changelog.md @@ -13,6 +13,10 @@ vNext replaces `git_reference_is_valid_name`. Tthe former functions are deprecated. +### Breaking CMake configuration changes + +The `MVSC_CRTDBG` configuration option is now `WIN32_LEAKCHECK`. + v1.1 ---- diff --git a/src/alloc.c b/src/alloc.c index 291511d62..6efa104ca 100644 --- a/src/alloc.c +++ b/src/alloc.c @@ -15,7 +15,7 @@ git_allocator git__allocator; static int setup_default_allocator(void) { -#if defined(GIT_MSVC_CRTDBG) +#if defined(GIT_WIN32_LEAKCHECK) return git_win32_leakcheck_init_allocator(&git__allocator); #else return git_stdalloc_init_allocator(&git__allocator); diff --git a/src/allocators/win32_leakcheck.c b/src/allocators/win32_leakcheck.c index 3be45cae6..fe06a14af 100644 --- a/src/allocators/win32_leakcheck.c +++ b/src/allocators/win32_leakcheck.c @@ -7,7 +7,7 @@ #include "win32_leakcheck.h" -#if defined(GIT_MSVC_CRTDBG) +#if defined(GIT_WIN32_LEAKCHECK) #include "win32/w32_leakcheck.h" diff --git a/src/features.h.in b/src/features.h.in index e000de5e0..c8d01804f 100644 --- a/src/features.h.in +++ b/src/features.h.in @@ -4,7 +4,7 @@ #cmakedefine GIT_DEBUG_POOL 1 #cmakedefine GIT_TRACE 1 #cmakedefine GIT_THREADS 1 -#cmakedefine GIT_MSVC_CRTDBG 1 +#cmakedefine GIT_WIN32_LEAKCHECK 1 #cmakedefine GIT_ARCH_64 1 #cmakedefine GIT_ARCH_32 1 diff --git a/src/win32/w32_leakcheck.c b/src/win32/w32_leakcheck.c index 31803d597..95187a570 100644 --- a/src/win32/w32_leakcheck.c +++ b/src/win32/w32_leakcheck.c @@ -7,7 +7,7 @@ #include "w32_leakcheck.h" -#if defined(GIT_MSVC_CRTDBG) +#if defined(GIT_WIN32_LEAKCHECK) #include "Windows.h" #include "Dbghelp.h" diff --git a/src/win32/w32_leakcheck.h b/src/win32/w32_leakcheck.h index 29bce4e89..7da03ab0e 100644 --- a/src/win32/w32_leakcheck.h +++ b/src/win32/w32_leakcheck.h @@ -13,7 +13,7 @@ /* Initialize the win32 leak checking system. */ int git_win32_leakcheck_global_init(void); -#if defined(GIT_MSVC_CRTDBG) +#if defined(GIT_WIN32_LEAKCHECK) #include <stdlib.h> #include <crtdbg.h> diff --git a/tests/clar_libgit2_trace.c b/tests/clar_libgit2_trace.c index d4d8d2c37..8eb6d4e8d 100644 --- a/tests/clar_libgit2_trace.c +++ b/tests/clar_libgit2_trace.c @@ -164,7 +164,7 @@ void _cl_trace_cb__event_handler( switch (ev) { case CL_TRACE__SUITE_BEGIN: git_trace(GIT_TRACE_TRACE, "\n\n%s\n%s: Begin Suite", HR, suite_name); -#if 0 && defined(GIT_MSVC_CRTDBG) +#if 0 && defined(GIT_WIN32_LEAKCHECK) git_win32__crtdbg_stacktrace__dump( GIT_WIN32__CRTDBG_STACKTRACE__SET_MARK, suite_name); @@ -172,7 +172,7 @@ void _cl_trace_cb__event_handler( break; case CL_TRACE__SUITE_END: -#if 0 && defined(GIT_MSVC_CRTDBG) +#if 0 && defined(GIT_WIN32_LEAKCHECK) /* As an example of checkpointing, dump leaks within this suite. * This may generate false positives for things like the global * TLS error state and maybe the odb cache since they aren't diff --git a/tests/trace/windows/stacktrace.c b/tests/trace/windows/stacktrace.c index 15604a575..0a77ef99d 100644 --- a/tests/trace/windows/stacktrace.c +++ b/tests/trace/windows/stacktrace.c @@ -1,7 +1,7 @@ #include "clar_libgit2.h" #include "win32/w32_leakcheck.h" -#if defined(GIT_MSVC_CRTDBG) +#if defined(GIT_WIN32_LEAKCHECK) static void a(void) { char buf[10000]; @@ -26,7 +26,7 @@ static void c(void) void test_trace_windows_stacktrace__basic(void) { -#if defined(GIT_MSVC_CRTDBG) +#if defined(GIT_WIN32_LEAKCHECK) c(); #endif } @@ -34,7 +34,7 @@ void test_trace_windows_stacktrace__basic(void) void test_trace_windows_stacktrace__leaks(void) { -#if defined(GIT_MSVC_CRTDBG) +#if defined(GIT_WIN32_LEAKCHECK) void * p1; void * p2; void * p3; @@ -124,7 +124,7 @@ void test_trace_windows_stacktrace__leaks(void) #endif } -#if defined(GIT_MSVC_CRTDBG) +#if defined(GIT_WIN32_LEAKCHECK) static void aux_cb_alloc__1(unsigned int *aux_id) { static unsigned int aux_counter = 0; @@ -141,7 +141,7 @@ static void aux_cb_lookup__1(unsigned int aux_id, char *aux_msg, size_t aux_msg_ void test_trace_windows_stacktrace__aux1(void) { -#if defined(GIT_MSVC_CRTDBG) +#if defined(GIT_WIN32_LEAKCHECK) git_win32_leakcheck_stack_set_aux_cb(aux_cb_alloc__1, aux_cb_lookup__1); c(); c(); |