#ifndef _WIN32
-
#include <OSD_Host.hxx>
#include <OSD_OSDError.hxx>
#include <OSD_WhoAmI.hxx>
static Standard_Integer memSize;
OSD_Host :: OSD_Host () {
-
+#ifndef OCCT_UWP
DWORD nSize;
- Standard_Character szHostName[ MAX_COMPUTERNAME_LENGTH + 1 ];
+ char szHostName[MAX_COMPUTERNAME_LENGTH + 1];
char* hostAddr = 0;
MEMORYSTATUS ms;
WSADATA wd;
PHOSTENT phe;
IN_ADDR inAddr;
- OSVERSIONINFO osVerInfo;
+ OSVERSIONINFOW osVerInfo;
if ( !fInit ) {
osVerInfo.dwOSVersionInfoSize = sizeof ( OSVERSIONINFO );
ZeroMemory (&ms, sizeof(ms));
- ZeroMemory ( szHostName, sizeof ( Standard_Character ) * (MAX_COMPUTERNAME_LENGTH + 1) );
+ ZeroMemory (szHostName, sizeof(char) * (MAX_COMPUTERNAME_LENGTH + 1));
#ifdef _MSC_VER
// suppress GetVersionEx() deprecation warning
#pragma warning(disable : 4996)
#endif
- if ( !GetVersionEx ( &osVerInfo ) ) {
-
- _osd_wnt_set_error ( myError, OSD_WHost );
-
- } else if ( !GetComputerName ( szHostName, &nSize ) ) {
-
- _osd_wnt_set_error ( myError, OSD_WHost );
-
- } else {
-
- ms.dwLength = sizeof ( MEMORYSTATUS );
- GlobalMemoryStatus ( &ms );
-
+ if (!GetVersionExW (&osVerInfo))
+ {
+ _osd_wnt_set_error (myError, OSD_WHost);
+ }
+ else if (!GetComputerNameA (szHostName, &nSize))
+ {
+ _osd_wnt_set_error (myError, OSD_WHost);
+ }
+ else
+ {
+ ms.dwLength = sizeof(MEMORYSTATUS);
+ GlobalMemoryStatus (&ms);
} // end else
#ifdef _MSC_VER
#pragma warning(default : 4996)
_osd_wnt_set_error ( myError, OSD_WHost );
- } else if ( ( phe = gethostbyname ( szHostName ) ) == NULL ) {
+ } else if ( ( phe = gethostbyname (szHostName) ) == NULL ) {
_osd_wnt_set_error ( myError, OSD_WHost );
if ( fInit )
myName = hostName;
-
+#endif
} // end constructor
TCollection_AsciiString OSD_Host :: SystemVersion () {