| Index: base/sys_info_mac.cc
|
| diff --git a/base/sys_info_mac.cc b/base/sys_info_mac.cc
|
| index 025c768f3cf96a855b9c0b4f1ce15c386dce7bb9..919a66fd98c6a0f01f18d139fbc05ea9c2a28e67 100644
|
| --- a/base/sys_info_mac.cc
|
| +++ b/base/sys_info_mac.cc
|
| @@ -24,15 +24,15 @@ std::string SysInfo::OperatingSystemName() {
|
|
|
| // static
|
| std::string SysInfo::OperatingSystemVersion() {
|
| - int32 major, minor, bugfix;
|
| + int32_t major, minor, bugfix;
|
| OperatingSystemVersionNumbers(&major, &minor, &bugfix);
|
| return base::StringPrintf("%d.%d.%d", major, minor, bugfix);
|
| }
|
|
|
| // static
|
| -void SysInfo::OperatingSystemVersionNumbers(int32* major_version,
|
| - int32* minor_version,
|
| - int32* bugfix_version) {
|
| +void SysInfo::OperatingSystemVersionNumbers(int32_t* major_version,
|
| + int32_t* minor_version,
|
| + int32_t* bugfix_version) {
|
| Gestalt(gestaltSystemVersionMajor,
|
| reinterpret_cast<SInt32*>(major_version));
|
| Gestalt(gestaltSystemVersionMinor,
|
| @@ -42,7 +42,7 @@ void SysInfo::OperatingSystemVersionNumbers(int32* major_version,
|
| }
|
|
|
| // static
|
| -int64 SysInfo::AmountOfPhysicalMemory() {
|
| +int64_t SysInfo::AmountOfPhysicalMemory() {
|
| struct host_basic_info hostinfo;
|
| mach_msg_type_number_t count = HOST_BASIC_INFO_COUNT;
|
| base::mac::ScopedMachSendRight host(mach_host_self());
|
| @@ -55,11 +55,11 @@ int64 SysInfo::AmountOfPhysicalMemory() {
|
| return 0;
|
| }
|
| DCHECK_EQ(HOST_BASIC_INFO_COUNT, count);
|
| - return static_cast<int64>(hostinfo.max_mem);
|
| + return static_cast<int64_t>(hostinfo.max_mem);
|
| }
|
|
|
| // static
|
| -int64 SysInfo::AmountOfAvailablePhysicalMemory() {
|
| +int64_t SysInfo::AmountOfAvailablePhysicalMemory() {
|
| base::mac::ScopedMachSendRight host(mach_host_self());
|
| vm_statistics_data_t vm_info;
|
| mach_msg_type_number_t count = HOST_VM_INFO_COUNT;
|
| @@ -72,8 +72,8 @@ int64 SysInfo::AmountOfAvailablePhysicalMemory() {
|
| return 0;
|
| }
|
|
|
| - return static_cast<int64>(
|
| - vm_info.free_count - vm_info.speculative_count) * PAGE_SIZE;
|
| + return static_cast<int64_t>(vm_info.free_count - vm_info.speculative_count) *
|
| + PAGE_SIZE;
|
| }
|
|
|
| // static
|
|
|