comparison src/share/vm/runtime/vm_version.cpp @ 647:bd441136a5ce

Merge
author kvn
date Thu, 19 Mar 2009 09:13:24 -0700
parents c3a720eefe82
children bd02caa94611
comparison
equal deleted inserted replaced
640:ba50942c8138 647:bd441136a5ce
161 #if _MSC_VER == 1100 161 #if _MSC_VER == 1100
162 #define HOTSPOT_BUILD_COMPILER "MS VC++ 5.0" 162 #define HOTSPOT_BUILD_COMPILER "MS VC++ 5.0"
163 #elif _MSC_VER == 1200 163 #elif _MSC_VER == 1200
164 #define HOTSPOT_BUILD_COMPILER "MS VC++ 6.0" 164 #define HOTSPOT_BUILD_COMPILER "MS VC++ 6.0"
165 #elif _MSC_VER == 1310 165 #elif _MSC_VER == 1310
166 #define HOTSPOT_BUILD_COMPILER "MS VC++ 7.1" 166 #define HOTSPOT_BUILD_COMPILER "MS VC++ 7.1 (VS2003)"
167 #elif _MSC_VER == 1400 167 #elif _MSC_VER == 1400
168 #define HOTSPOT_BUILD_COMPILER "MS VC++ 8.0" 168 #define HOTSPOT_BUILD_COMPILER "MS VC++ 8.0 (VS2005)"
169 #elif _MSC_VER == 1500
170 #define HOTSPOT_BUILD_COMPILER "MS VC++ 9.0 (VS2008)"
169 #else 171 #else
170 #define HOTSPOT_BUILD_COMPILER "unknown MS VC++:" XSTR(_MSC_VER) 172 #define HOTSPOT_BUILD_COMPILER "unknown MS VC++:" XSTR(_MSC_VER)
171 #endif 173 #endif
172 #elif defined(__SUNPRO_CC) 174 #elif defined(__SUNPRO_CC)
173 #if __SUNPRO_CC == 0x420 175 #if __SUNPRO_CC == 0x420