comparison src/share/vm/prims/jvmtiEnter.xsl @ 18041:52b4284cb496

Merge with jdk8u20-b26
author Gilles Duboscq <duboscq@ssw.jku.at>
date Wed, 15 Oct 2014 16:02:50 +0200
parents 89152779163c 78bbf4d43a14
children
comparison
equal deleted inserted replaced
17606:45d7b2c7029d 18041:52b4284cb496
1 <?xml version="1.0"?> 1 <?xml version="1.0"?>
2 <!-- 2 <!--
3 Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved. 3 Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved.
4 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 4 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
5 5
6 This code is free software; you can redistribute it and/or modify it 6 This code is free software; you can redistribute it and/or modify it
7 under the terms of the GNU General Public License version 2 only, as 7 under the terms of the GNU General Public License version 2 only, as
8 published by the Free Software Foundation. 8 published by the Free Software Foundation.
40 # include "utilities/macros.hpp" 40 # include "utilities/macros.hpp"
41 #if INCLUDE_JVMTI 41 #if INCLUDE_JVMTI
42 # include "prims/jvmtiEnter.hpp" 42 # include "prims/jvmtiEnter.hpp"
43 # include "prims/jvmtiRawMonitor.hpp" 43 # include "prims/jvmtiRawMonitor.hpp"
44 # include "prims/jvmtiUtil.hpp" 44 # include "prims/jvmtiUtil.hpp"
45
46 // There are known-bad format/arg pairings in the code generated by this file.
47 PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC
45 48
46 </xsl:text> 49 </xsl:text>
47 50
48 <xsl:if test="$trace = 'Trace'"> 51 <xsl:if test="$trace = 'Trace'">
49 <xsl:text> 52 <xsl:text>