Index: base/sys_info_ios.mm |
diff --git a/base/sys_info_ios.mm b/base/sys_info_ios.mm |
index 5aa3180976e76ec01732b20402d1d5a5f6a92b3a..56e7b556bbf4628dd37d26ac3933060cbf15969e 100644 |
--- a/base/sys_info_ios.mm |
+++ b/base/sys_info_ios.mm |
@@ -43,9 +43,9 @@ std::string SysInfo::OperatingSystemVersion() { |
} |
// 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) { |
base::mac::ScopedNSAutoreleasePool pool; |
std::string system_version = OperatingSystemVersion(); |
if (!system_version.empty()) { |
@@ -62,7 +62,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()); |
@@ -75,11 +75,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; |
@@ -91,8 +91,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 |