git-svn-id: svn://db.shs.com.ru/pip@333 12ceb7fc-bf1f-11e4-8940-5bc7170c53b5

This commit is contained in:
2017-04-07 14:18:51 +00:00
parent 692a31e9a1
commit f6a09ebe93
4 changed files with 16 additions and 5 deletions

View File

@@ -335,7 +335,7 @@ private:
if (s <= 0) return 0;
if (pid_rsize + pid_rsize >= size_t(s) && pid_rsize < size_t(s))
return pid_rsize + pid_rsize;
size_t t = 0, s_ = size_t(s) - 1;
ssize_t t = 0, s_ = s - 1;
while (s_ >> t) ++t;
return (1 << t);
}

View File

@@ -304,7 +304,7 @@ private:
if (s == 0) return 0;
if (piv_rsize + piv_rsize >= s && piv_rsize < s)
return piv_rsize + piv_rsize;
size_t t = 0, s_ = s - 1;
ssize_t t = 0, s_ = s - 1;
while (s_ >> t) ++t;
return (1 << t);
}

View File

@@ -111,7 +111,7 @@ PIInit::PIInit() {
DWORD dwVersion = GetVersion();
DWORD dwMajorVersion = (DWORD)(LOBYTE(LOWORD(dwVersion)));
DWORD dwMinorVersion = (DWORD)(HIBYTE(LOWORD(dwVersion)));
sinfo->OS_version = PIString(dwMajorVersion) + "." + PIString(dwMinorVersion);
sinfo->OS_version = PIString::fromNumber(dwMajorVersion) + "." + PIString::fromNumber(dwMinorVersion);
// WinSock inint
WSADATA wsaData;