Mercurial > hg > graal-jvmci-8
comparison src/share/vm/prims/jvm.cpp @ 14726:92aa6797d639
Backed out merge changeset: b51e29501f30
Backed out merge revision to its first parent (8f483e200405)
| author | Doug Simon <doug.simon@oracle.com> |
|---|---|
| date | Mon, 24 Mar 2014 21:30:43 +0100 |
| parents | b51e29501f30 |
| children |
comparison
equal
deleted
inserted
replaced
| 14719:0bdd0d157040 | 14726:92aa6797d639 |
|---|---|
| 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, info_size); | 4376 memset(info, 0, sizeof(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 |