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

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
comparison
equal deleted inserted replaced
4044:2ec638646e86 4045:a6eef545f1a2
171 // the thread to _thread_in_vm. However, when the TLS for a thread 171 // the thread to _thread_in_vm. However, when the TLS for a thread
172 // other than the current thread is required we need to transition 172 // other than the current thread is required we need to transition
173 // from native so as to resolve the jthread. 173 // from native so as to resolve the jthread.
174 174
175 ThreadInVMfromNative __tiv(current_thread); 175 ThreadInVMfromNative __tiv(current_thread);
176 __ENTRY(jvmtiError, JvmtiEnv::GetThreadLocalStorage , current_thread) 176 VM_ENTRY_BASE(jvmtiError, JvmtiEnv::GetThreadLocalStorage , current_thread)
177 debug_only(VMNativeEntryWrapper __vew;) 177 debug_only(VMNativeEntryWrapper __vew;)
178 178
179 oop thread_oop = JNIHandles::resolve_external_guard(thread); 179 oop thread_oop = JNIHandles::resolve_external_guard(thread);
180 if (thread_oop == NULL) { 180 if (thread_oop == NULL) {
181 return JVMTI_ERROR_INVALID_THREAD; 181 return JVMTI_ERROR_INVALID_THREAD;