Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(22)

Unified Diff: chromeos/network/network_util.h

Issue 1540803002: Switch to standard integer types in chromeos/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: more includes Created 5 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chromeos/network/network_ui_data.h ('k') | chromeos/network/network_util.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chromeos/network/network_util.h
diff --git a/chromeos/network/network_util.h b/chromeos/network/network_util.h
index 47cdcde623357e8d6a918dec97de1c56a516e497..b8fee4547e179efb5552d70704bebeaff67d22cd 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(
« no previous file with comments | « chromeos/network/network_ui_data.h ('k') | chromeos/network/network_util.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698