| Index: net/base/net_util.h
|
| diff --git a/net/base/net_util.h b/net/base/net_util.h
|
| index 06bb9c5f692f2247e6777ba0ac46eff95c7e519b..00398f2c72640d70ca2e46a28a3acd255b548de5 100644
|
| --- a/net/base/net_util.h
|
| +++ b/net/base/net_util.h
|
| @@ -44,8 +44,8 @@ struct Parsed;
|
| namespace net {
|
|
|
| // Used by FormatUrl to specify handling of certain parts of the url.
|
| -typedef uint32 FormatUrlType;
|
| -typedef uint32 FormatUrlTypes;
|
| +typedef uint32_t FormatUrlType;
|
| +typedef uint32_t FormatUrlTypes;
|
|
|
| #if defined(OS_WIN)
|
| // Bluetooth address size. Windows Bluetooth is supported via winsock.
|
| @@ -121,7 +121,7 @@ bool GetIPAddressFromSockAddr(const struct sockaddr* sock_addr,
|
| socklen_t sock_addr_len,
|
| const unsigned char** address,
|
| size_t* address_len,
|
| - uint16* port);
|
| + uint16_t* port);
|
|
|
| // Same as IPAddressToString() but for a sockaddr. This output will not include
|
| // the IPv6 scope ID.
|
| @@ -204,7 +204,8 @@ NET_EXPORT std::string GetDirectoryListingHeader(const base::string16& title);
|
| // Both |name| and |raw_bytes| are escaped internally.
|
| NET_EXPORT std::string GetDirectoryListingEntry(const base::string16& name,
|
| const std::string& raw_bytes,
|
| - bool is_dir, int64 size,
|
| + bool is_dir,
|
| + int64_t size,
|
| base::Time modified);
|
|
|
| // If text starts with "www." it is removed, otherwise text is returned
|
| @@ -215,7 +216,7 @@ NET_EXPORT base::string16 StripWWW(const base::string16& text);
|
| NET_EXPORT base::string16 StripWWWFromHost(const GURL& url);
|
|
|
| // Checks if |port| is in the valid range (0 to 65535, though 0 is technically
|
| -// reserved). Should be used before casting a port to a uint16.
|
| +// reserved). Should be used before casting a port to a uint16_t.
|
| NET_EXPORT bool IsPortValid(int port);
|
|
|
| // Checks |port| against a list of ports which are restricted by default.
|
| @@ -342,8 +343,8 @@ NET_EXPORT_PRIVATE AddressFamily GetAddressFamily(
|
| NET_EXPORT_PRIVATE int ConvertAddressFamily(AddressFamily address_family);
|
|
|
| // Retuns the port field of the |sockaddr|.
|
| -const uint16* GetPortFieldFromSockaddr(const struct sockaddr* address,
|
| - socklen_t address_len);
|
| +const uint16_t* GetPortFieldFromSockaddr(const struct sockaddr* address,
|
| + socklen_t address_len);
|
| // Returns the value of port in |sockaddr| (in host byte ordering).
|
| NET_EXPORT_PRIVATE int GetPortFromSockaddr(const struct sockaddr* address,
|
| socklen_t address_len);
|
|
|