# HG changeset patch
# User chegar
# Date 1529513680 -3600
# Node ID fba6889d5635d282f3e9ff32f545c9a732003151
# Parent  9663777e8d41320d950f6625001500973c2fa38f# Parent  dd2ebc050e6e87cb387972bb1dd02ec8a5292400
Merge

diff -r 9663777e8d41 -r fba6889d5635 src/hotspot/share/runtime/vm_version.cpp
--- a/src/hotspot/share/runtime/vm_version.cpp	Wed Jun 20 17:48:39 2018 +0100
+++ b/src/hotspot/share/runtime/vm_version.cpp	Wed Jun 20 17:54:40 2018 +0100
@@ -115,7 +115,7 @@
 
 const char* Abstract_VM_Version::vm_vendor() {
 #ifdef VENDOR
-  return XSTR(VENDOR);
+  return VENDOR;
 #else
   return "Oracle Corporation";
 #endif