| Index: webrtc/base/systeminfo.cc
|
| diff --git a/webrtc/base/systeminfo.cc b/webrtc/base/systeminfo.cc
|
| index 540de82313e837fe884a9609833563e00d31f11a..bfc96b3763501214ee197ff65cf1edd4d8f5168c 100644
|
| --- a/webrtc/base/systeminfo.cc
|
| +++ b/webrtc/base/systeminfo.cc
|
| @@ -161,8 +161,8 @@ std::string SystemInfo::GetCpuVendor() {
|
|
|
| // Returns the amount of installed physical memory in Bytes. Cacheable.
|
| // Returns -1 on error.
|
| -int64 SystemInfo::GetMemorySize() {
|
| - int64 memory = -1;
|
| +int64_t SystemInfo::GetMemorySize() {
|
| + int64_t memory = -1;
|
|
|
| #if defined(WEBRTC_WIN)
|
| MEMORYSTATUSEX status = {0};
|
| @@ -180,8 +180,8 @@ int64 SystemInfo::GetMemorySize() {
|
| if (error || memory == 0)
|
| memory = -1;
|
| #elif defined(WEBRTC_LINUX)
|
| - memory = static_cast<int64>(sysconf(_SC_PHYS_PAGES)) *
|
| - static_cast<int64>(sysconf(_SC_PAGESIZE));
|
| + memory = static_cast<int64_t>(sysconf(_SC_PHYS_PAGES)) *
|
| + static_cast<int64_t>(sysconf(_SC_PAGESIZE));
|
| if (memory < 0) {
|
| LOG(LS_WARNING) << "sysconf(_SC_PHYS_PAGES) failed."
|
| << "sysconf(_SC_PHYS_PAGES) " << sysconf(_SC_PHYS_PAGES)
|
|
|