diff options
| author | avi <avi@chromium.org> | 2015-12-20 19:43:20 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-12-21 03:44:30 +0000 |
| commit | 6e1a22dbf2f897399d459f0e1a813decf02ff002 (patch) | |
| tree | 1514d498779a6799f72b1f0310c7c54ec533494b /chromeos/network/network_util.h | |
| parent | 77bc325cc5c97ebff1d447ac972fd02e2aec4155 (diff) | |
| download | chromium_src-6e1a22dbf2f897399d459f0e1a813decf02ff002.zip chromium_src-6e1a22dbf2f897399d459f0e1a813decf02ff002.tar.gz chromium_src-6e1a22dbf2f897399d459f0e1a813decf02ff002.tar.bz2 | |
Switch to standard integer types in chromeos/.
BUG=138542
TBR=zelidrag@chromium.org
Review URL: https://codereview.chromium.org/1540803002
Cr-Commit-Position: refs/heads/master@{#366324}
Diffstat (limited to 'chromeos/network/network_util.h')
| -rw-r--r-- | chromeos/network/network_util.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/chromeos/network/network_util.h b/chromeos/network/network_util.h index 47cdcde..b8fee45 100644 --- a/chromeos/network/network_util.h +++ b/chromeos/network/network_util.h @@ -10,10 +10,11 @@ // All calls to functions in chromeos_network.h should be made through // functions provided by this header. +#include <stdint.h> + #include <string> #include <vector> -#include "base/basictypes.h" #include "base/callback.h" #include "base/memory/scoped_ptr.h" #include "base/time/time.h" @@ -75,11 +76,11 @@ namespace network_util { // Converts a |prefix_length| to a netmask. (for IPv4 only) // e.g. a |prefix_length| of 24 is converted to a netmask of "255.255.255.0". // Invalid prefix lengths will return the empty string. -CHROMEOS_EXPORT std::string PrefixLengthToNetmask(int32 prefix_length); +CHROMEOS_EXPORT std::string PrefixLengthToNetmask(int32_t prefix_length); // Converts a |netmask| to a prefixlen. (for IPv4 only) // e.g. a |netmask| of 255.255.255.0 is converted to a prefixlen of 24 -CHROMEOS_EXPORT int32 NetmaskToPrefixLength(const std::string& netmask); +CHROMEOS_EXPORT int32_t NetmaskToPrefixLength(const std::string& netmask); // Returns |shill_mac_address| in aa:bb format. CHROMEOS_EXPORT std::string FormattedMacAddress( |