comparison src/share/vm/prims/jvm.cpp @ 14704:b51e29501f30

Merged with jdk9/dev/hotspot changeset 9486a41de3b7
author twisti
date Tue, 18 Mar 2014 20:19:10 -0700
parents d8041d695d19 cd30121047ac
children 92aa6797d639
comparison
equal deleted inserted replaced
14647:8f483e200405 14704:b51e29501f30
4371 } 4371 }
4372 JVM_END 4372 JVM_END
4373 4373
4374 JVM_ENTRY(void, JVM_GetVersionInfo(JNIEnv* env, jvm_version_info* info, size_t info_size)) 4374 JVM_ENTRY(void, JVM_GetVersionInfo(JNIEnv* env, jvm_version_info* info, size_t info_size))
4375 { 4375 {
4376 memset(info, 0, sizeof(info_size)); 4376 memset(info, 0, info_size);
4377 4377
4378 info->jvm_version = Abstract_VM_Version::jvm_version(); 4378 info->jvm_version = Abstract_VM_Version::jvm_version();
4379 info->update_version = 0; /* 0 in HotSpot Express VM */ 4379 info->update_version = 0; /* 0 in HotSpot Express VM */
4380 info->special_update_version = 0; /* 0 in HotSpot Express VM */ 4380 info->special_update_version = 0; /* 0 in HotSpot Express VM */
4381 4381