ENH: oops
This commit is contained in:
parent
45793aad16
commit
b55f7a261f
@ -4172,6 +4172,7 @@ kwsys_stl::string SystemTools::GetOperatingSystemNameAndVersion()
|
|||||||
|
|
||||||
if (osvi.dwMajorVersion == 6 && osvi.dwMinorVersion == 0)
|
if (osvi.dwMajorVersion == 6 && osvi.dwMinorVersion == 0)
|
||||||
{
|
{
|
||||||
|
#if (_MSC_VER >= 1300)
|
||||||
if (osvi.wProductType == VER_NT_WORKSTATION)
|
if (osvi.wProductType == VER_NT_WORKSTATION)
|
||||||
{
|
{
|
||||||
res += "Microsoft Windows Vista";
|
res += "Microsoft Windows Vista";
|
||||||
@ -4180,6 +4181,9 @@ kwsys_stl::string SystemTools::GetOperatingSystemNameAndVersion()
|
|||||||
{
|
{
|
||||||
res += "Microsoft Windows Server 2008 family";
|
res += "Microsoft Windows Server 2008 family";
|
||||||
}
|
}
|
||||||
|
#else
|
||||||
|
res += "Microsoft Windows Vista or Windows Server 2003";
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
if (osvi.dwMajorVersion == 5 && osvi.dwMinorVersion == 2)
|
if (osvi.dwMajorVersion == 5 && osvi.dwMinorVersion == 2)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user