< prev index next >

src/share/vm/runtime/vm_version.cpp

Print this page
rev 9742 : imported patch veronafix

*** 66,85 **** #ifndef DEBUG_LEVEL #error DEBUG_LEVEL must be defined #endif ! // NOTE: Builds within Visual Studio do not define the build target in ! // HOTSPOT_VERSION_STRING, so it must be done here ! #if defined(VISUAL_STUDIO_BUILD) && !defined(PRODUCT) ! #ifndef HOTSPOT_BUILD_TARGET ! #error HOTSPOT_BUILD_TARGET must be defined ! #endif ! #define VM_RELEASE HOTSPOT_VERSION_STRING "-" HOTSPOT_BUILD_TARGET ! #else ! #define VM_RELEASE HOTSPOT_VERSION_STRING ! #endif // HOTSPOT_VERSION_STRING equals the JDK VERSION_STRING (unless overridden // in a standalone build). int Abstract_VM_Version::_vm_major_version = VERSION_MAJOR; int Abstract_VM_Version::_vm_minor_version = VERSION_MINOR; --- 66,76 ---- #ifndef DEBUG_LEVEL #error DEBUG_LEVEL must be defined #endif ! #define VM_RELEASE HOTSPOT_VERSION_STRING // HOTSPOT_VERSION_STRING equals the JDK VERSION_STRING (unless overridden // in a standalone build). int Abstract_VM_Version::_vm_major_version = VERSION_MAJOR; int Abstract_VM_Version::_vm_minor_version = VERSION_MINOR;
< prev index next >