aleajactaest/khanat-opennel-code
1
0
Fork 0
mirror of https://port.numenaute.org/aleajactaest/khanat-opennel-code.git synced 2024-11-22 15:16:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Changed: #866 VER_SUITE_STORAGE_SERVER and VER_SUITE_COMPUTE_SERVER not defined

Browse source
This commit is contained in:
kervala 2010-05-10 09:26:02 +02:00
parent 0939306ec7
commit a1057ccaba
1 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
code/nel/src/misc/system_info.cpp
View file

@ -477,8 +477,10 @@ string CSystemInfo::getOS()
{ {
if( GetSystemMetrics(89 /* SM_SERVERR2 */) ) if( GetSystemMetrics(89 /* SM_SERVERR2 */) )
OSString += " Windows Server 2003 R2"; OSString += " Windows Server 2003 R2";
#ifdef VER_SUITE_STORAGE_SERVER
else if ( osvi.wSuiteMask == VER_SUITE_STORAGE_SERVER ) else if ( osvi.wSuiteMask == VER_SUITE_STORAGE_SERVER )
OSString += " Windows Storage Server 2003"; OSString += " Windows Storage Server 2003";
#endif
#ifdef VER_SUITE_WH_SERVER #ifdef VER_SUITE_WH_SERVER
else if ( osvi.wSuiteMask == VER_SUITE_WH_SERVER ) else if ( osvi.wSuiteMask == VER_SUITE_WH_SERVER )
OSString += " Windows Home Server"; OSString += " Windows Home Server";
@ -512,14 +514,20 @@ string CSystemInfo::getOS()
else else
{ {
if ( osvi.wSuiteMask & VER_SUITE_COMPUTE_SERVER ) if( osvi.wSuiteMask & VER_SUITE_ENTERPRISE )
OSString += " Compute Cluster Edition"; OSString += " Enterprise Edition";
#ifdef VER_SUITE_DATACENTER
else if( osvi.wSuiteMask & VER_SUITE_DATACENTER ) else if( osvi.wSuiteMask & VER_SUITE_DATACENTER )
OSString += " Datacenter Edition"; OSString += " Datacenter Edition";
else if( osvi.wSuiteMask & VER_SUITE_ENTERPRISE ) #endif
OSString += " Enterprise Edition"; #ifdef VER_SUITE_BLADE
else if ( osvi.wSuiteMask & VER_SUITE_BLADE ) else if ( osvi.wSuiteMask & VER_SUITE_BLADE )
OSString += " Web Edition"; OSString += " Web Edition";
#endif
#ifdef VER_SUITE_COMPUTE_SERVER
else if ( osvi.wSuiteMask & VER_SUITE_COMPUTE_SERVER )
OSString += " Compute Cluster Edition";
#endif
else else
OSString += " Standard Edition"; OSString += " Standard Edition";
} }