comparison src/share/vm/runtime/vm_version.cpp @ 4970:33df1aeaebbf

Merge with http://hg.openjdk.java.net/hsx/hsx24/hotspot/
author Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
date Mon, 27 Feb 2012 13:10:13 +0100
parents 723df37192d6 c77d473e71f7
children e522a00b91aa
comparison
equal deleted inserted replaced
4703:2cfb7fb2dce7 4970:33df1aeaebbf
165 // NOTE: do *not* use stringStream. this function is called by 165 // NOTE: do *not* use stringStream. this function is called by
166 // fatal error handler. if the crash is in native thread, 166 // fatal error handler. if the crash is in native thread,
167 // stringStream cannot get resource allocated and will SEGV. 167 // stringStream cannot get resource allocated and will SEGV.
168 const char* Abstract_VM_Version::vm_release() { 168 const char* Abstract_VM_Version::vm_release() {
169 return VM_RELEASE; 169 return VM_RELEASE;
170 }
171
172 // NOTE: do *not* use stringStream. this function is called by
173 // fatal error handlers. if the crash is in native thread,
174 // stringStream cannot get resource allocated and will SEGV.
175 const char* Abstract_VM_Version::jre_release_version() {
176 return JRE_RELEASE_VERSION;
170 } 177 }
171 178
172 #define OS LINUX_ONLY("linux") \ 179 #define OS LINUX_ONLY("linux") \
173 WINDOWS_ONLY("windows") \ 180 WINDOWS_ONLY("windows") \
174 SOLARIS_ONLY("solaris") \ 181 SOLARIS_ONLY("solaris") \