Mercurial > hg > graal-compiler

diff src/share/vm/prims/jvmtiEnv.cpp @ 4045:a6eef545f1a2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
7103224: collision between __LEAF define in interfaceSupport.hpp and /usr/include/sys/cdefs.h with gcc Reviewed-by: never Contributed-by: Omair Majid <omajid@redhat.com>
author never
date Tue, 25 Oct 2011 08:17:15 -0700
parents f08d439fab8c
children 4ceaf61479fc
line wrap: on
line diff
--- a/src/share/vm/prims/jvmtiEnv.cpp	Tue Oct 25 04:07:20 2011 -0700
+++ b/src/share/vm/prims/jvmtiEnv.cpp	Tue Oct 25 08:17:15 2011 -0700
@@ -173,7 +173,7 @@
     // from native so as to resolve the jthread.
 
     ThreadInVMfromNative __tiv(current_thread);
-    __ENTRY(jvmtiError, JvmtiEnv::GetThreadLocalStorage , current_thread)
+    VM_ENTRY_BASE(jvmtiError, JvmtiEnv::GetThreadLocalStorage , current_thread)
     debug_only(VMNativeEntryWrapper __vew;)
 
     oop thread_oop = JNIHandles::resolve_external_guard(thread);