luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-08-20 23:58:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'backport-2293-msvc-analyser-fix-glib-2-70' into 'glib-2-70'

Browse Source 
Backport !2293 “glib-private: Fix MSVC build with AddressSanitizer” to glib-2-70

See merge request GNOME/glib!2301
This commit is contained in:
Sebastian Dröge
2021-10-19 06:30:41 +00:00
parent 476895b85f 376c9c360d
commit 7c9b1781e4
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
glib/glib-private.h
View File

@@ -23,8 +23,14 @@
#include "gstdioprivate.h" #include "gstdioprivate.h"
/* gcc defines __SANITIZE_ADDRESS__, clang sets the address_sanitizer /* gcc defines __SANITIZE_ADDRESS__, clang sets the address_sanitizer
* feature flag */ * feature flag.
#if defined(__SANITIZE_ADDRESS__) || g_macro__has_feature(address_sanitizer) *
* MSVC defines __SANITIZE_ADDRESS__ as well when AddressSanitizer
* is enabled but __lsan_ignore_object() equivalent method is not supported
* See also
* https://docs.microsoft.com/en-us/cpp/sanitizers/asan-building?view=msvc-160
*/
#if !defined(_MSC_VER) && (defined(__SANITIZE_ADDRESS__) || g_macro__has_feature(address_sanitizer))
/* /*
* %_GLIB_ADDRESS_SANITIZER: * %_GLIB_ADDRESS_SANITIZER: