summaryrefslogtreecommitdiffstats
path: root/nsprpub/lib
diff options
context:
space:
mode:
authorwolfbeast <mcwerewolf@gmail.com>2018-12-15 01:40:18 +0100
committerwolfbeast <mcwerewolf@gmail.com>2018-12-15 01:40:18 +0100
commit09ef48bd005a7f9e97a3fe797a079fcf2b5e58d3 (patch)
treeb6ae903223a8a30b9f49b1769f5cb856ab41a9bc /nsprpub/lib
parent023af95abeb4a9bd61665f37fc8dec173e0f2f4a (diff)
downloadUXP-09ef48bd005a7f9e97a3fe797a079fcf2b5e58d3.tar
UXP-09ef48bd005a7f9e97a3fe797a079fcf2b5e58d3.tar.gz
UXP-09ef48bd005a7f9e97a3fe797a079fcf2b5e58d3.tar.lz
UXP-09ef48bd005a7f9e97a3fe797a079fcf2b5e58d3.tar.xz
UXP-09ef48bd005a7f9e97a3fe797a079fcf2b5e58d3.zip
Update NSPR to 4.20
Diffstat (limited to 'nsprpub/lib')
-rw-r--r--nsprpub/lib/ds/plarena.h15
1 files changed, 13 insertions, 2 deletions
diff --git a/nsprpub/lib/ds/plarena.h b/nsprpub/lib/ds/plarena.h
index 5336a0e4d..0ca00c0ac 100644
--- a/nsprpub/lib/ds/plarena.h
+++ b/nsprpub/lib/ds/plarena.h
@@ -95,13 +95,24 @@ struct PLArenaPool {
#if defined(PL_SANITIZE_ADDRESS)
+#if defined(_MSC_VER)
+/* We can't use dllimport due to DLL linkage mismatch with
+ * sanitizer/asan_interface.h.
+ */
+#define PL_ASAN_VISIBILITY(type_) type_
+#else
+#define PL_ASAN_VISIBILITY(type_) PR_IMPORT(type_)
+#endif
+
/* These definitions are usually provided through the
* sanitizer/asan_interface.h header installed by ASan.
* See https://github.com/google/sanitizers/wiki/AddressSanitizerManualPoisoning
*/
-PR_IMPORT(void) __asan_poison_memory_region(void const volatile *addr, size_t size);
-PR_IMPORT(void) __asan_unpoison_memory_region(void const volatile *addr, size_t size);
+PL_ASAN_VISIBILITY(void) __asan_poison_memory_region(
+ void const volatile *addr, size_t size);
+PL_ASAN_VISIBILITY(void) __asan_unpoison_memory_region(
+ void const volatile *addr, size_t size);
#define PL_MAKE_MEM_NOACCESS(addr, size) \
__asan_poison_memory_region((addr), (size))