Mercurial > hg > truffle
comparison src/share/vm/runtime/vmStructs.cpp @ 8016:1135141fb97e
Merge
author | brutisso |
---|---|
date | Fri, 08 Feb 2013 10:08:40 +0100 |
parents | 3c9bc17b9403 80518f4ecf32 |
children | 927a311d00f9 |
comparison
equal
deleted
inserted
replaced
8004:df8462fbe585 | 8016:1135141fb97e |
---|---|
1160 static_field(Abstract_VM_Version, _s_vm_release, const char*) \ | 1160 static_field(Abstract_VM_Version, _s_vm_release, const char*) \ |
1161 static_field(Abstract_VM_Version, _s_internal_vm_info_string, const char*) \ | 1161 static_field(Abstract_VM_Version, _s_internal_vm_info_string, const char*) \ |
1162 static_field(Abstract_VM_Version, _vm_major_version, int) \ | 1162 static_field(Abstract_VM_Version, _vm_major_version, int) \ |
1163 static_field(Abstract_VM_Version, _vm_minor_version, int) \ | 1163 static_field(Abstract_VM_Version, _vm_minor_version, int) \ |
1164 static_field(Abstract_VM_Version, _vm_build_number, int) \ | 1164 static_field(Abstract_VM_Version, _vm_build_number, int) \ |
1165 static_field(Abstract_VM_Version, _reserve_for_allocation_prefetch, int) \ | |
1165 \ | 1166 \ |
1166 static_field(JDK_Version, _current, JDK_Version) \ | 1167 static_field(JDK_Version, _current, JDK_Version) \ |
1167 nonstatic_field(JDK_Version, _partially_initialized, bool) \ | 1168 nonstatic_field(JDK_Version, _partially_initialized, bool) \ |
1168 nonstatic_field(JDK_Version, _major, unsigned char) \ | 1169 nonstatic_field(JDK_Version, _major, unsigned char) \ |
1169 \ | 1170 \ |