summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorshyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2018-11-06 11:53:01 +0000
committershyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2018-11-06 11:53:01 +0000
commitbb2ee549ef69166fb68d0f02c7a34fa30065a107 (patch)
tree614e2dd8965b98a170bf734cb6ec928e6097175f
parent3f97d88ac43eb1a49d4aa3e636efbeaac76aa9d4 (diff)
workaround C++ism in ASAN header
See also: https://travis-ci.org/ruby/ruby/jobs/451299690 git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@65576 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--internal.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/internal.h b/internal.h
index 8510ed2..2f3124f 100644
--- a/internal.h
+++ b/internal.h
@@ -95,6 +95,8 @@ extern "C" {
# define __has_extension __has_feature
#endif
+#ifndef MJIT_HEADER
+
#ifdef HAVE_SANITIZER_ASAN_INTERFACE_H
# include <sanitizer/asan_interface.h>
#endif
@@ -149,6 +151,8 @@ unpoison_object(VALUE obj, bool newobj_p)
unpoison_memory_region(ptr, SIZEOF_VALUE, newobj_p);
}
+#endif
+
/* Prevent compiler from reordering access */
#define ACCESS_ONCE(type,x) (*((volatile type *)&(x)))