Mercurial > jdk8-mips64-public > hotspot / file comparison
comparison: src/share/vm/runtime/vm_version.cpp
src/share/vm/runtime/vm_version.cpp
- changeset 2155
- 728a287f6c20
- parent 2047
- d2ede61b7a12
- child 2314
- f95d63e2154a
equal
deleted
inserted
replaced
| 2131:8a8a7a014a12 | 2155:728a287f6c20 |
|---|---|
| 119 | 119 |
| 120 const char* Abstract_VM_Version::vm_vendor() { | 120 const char* Abstract_VM_Version::vm_vendor() { |
| 121 #ifdef VENDOR | 121 #ifdef VENDOR |
| 122 return XSTR(VENDOR); | 122 return XSTR(VENDOR); |
| 123 #else | 123 #else |
| 124 return "Sun Microsystems Inc."; | 124 return JDK_Version::is_gte_jdk17x_version() ? |
| 125 "Oracle Corporation" : "Sun Microsystems Inc."; | |
| 125 #endif | 126 #endif |
| 126 } | 127 } |
| 127 | 128 |
| 128 | 129 |
| 129 const char* Abstract_VM_Version::vm_info_string() { | 130 const char* Abstract_VM_Version::vm_info_string() { |
