aboutsummaryrefslogtreecommitdiff
path: root/libsanitizer/tsan/tsan_interface_java.h
diff options
context:
space:
mode:
authorMartin Liska <mliska@suse.cz>2019-11-05 14:54:57 +0100
committerMartin Liska <marxin@gcc.gnu.org>2019-11-05 13:54:57 +0000
commit3ca75cd55030a53a858bdbe9aba6d87f6b1e90b8 (patch)
treec3eb5c5658e168b819d23dd20aa46d614089c649 /libsanitizer/tsan/tsan_interface_java.h
parent9bae89924afc811bd10e249856bf78dd19f20df2 (diff)
downloadgcc-3ca75cd55030a53a858bdbe9aba6d87f6b1e90b8.zip
gcc-3ca75cd55030a53a858bdbe9aba6d87f6b1e90b8.tar.gz
gcc-3ca75cd55030a53a858bdbe9aba6d87f6b1e90b8.tar.bz2
Libsanitizer: merge from trunk with merge.sh.
2019-11-05 Martin Liska <mliska@suse.cz> * all source files: Merge from upstream r375507. From-SVN: r277834
Diffstat (limited to 'libsanitizer/tsan/tsan_interface_java.h')
-rw-r--r--libsanitizer/tsan/tsan_interface_java.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/libsanitizer/tsan/tsan_interface_java.h b/libsanitizer/tsan/tsan_interface_java.h
index 93e67bd..51b4452 100644
--- a/libsanitizer/tsan/tsan_interface_java.h
+++ b/libsanitizer/tsan/tsan_interface_java.h
@@ -31,7 +31,7 @@
extern "C" {
#endif
-typedef unsigned long jptr; // NOLINT
+typedef unsigned long jptr;
// Must be called before any other callback from Java.
void __tsan_java_init(jptr heap_begin, jptr heap_size) INTERFACE_ATTRIBUTE;