Switch to standard integer types in ppapi/.

ppapi/shared_impl/private/net_address_private_impl.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ppapi/shared_impl/private/net_address_private_impl.h"
 
-#if defined(OS_WIN)
-#include <windows.h>
-#include <winsock2.h>
-#include <ws2tcpip.h>
-#elif defined(OS_POSIX) && !defined(OS_NACL)
-#include <arpa/inet.h>
-#include <sys/socket.h>
-#include <sys/types.h>
-#endif
-
+#include <stddef.h>
 #include <string.h>
 
 #include <string>
 
-#include "base/basictypes.h"
 #include "base/logging.h"
 #include "base/strings/stringprintf.h"
 #include "build/build_config.h"
 #include "ppapi/c/pp_var.h"
 #include "ppapi/c/private/ppb_net_address_private.h"
 #include "ppapi/shared_impl/proxy_lock.h"
 #include "ppapi/shared_impl/var.h"
 #include "ppapi/thunk/thunk.h"
 
+#if defined(OS_WIN)
+#include <windows.h>
+#include <winsock2.h>
+#include <ws2tcpip.h>
+#elif defined(OS_POSIX) && !defined(OS_NACL)
+#include <arpa/inet.h>
+#include <sys/socket.h>
+#include <sys/types.h>
+#endif
+
 #if defined(OS_MACOSX)
 // This is a bit evil, but it's standard operating procedure for |s6_addr|....
 #define s6_addr16 __u6_addr.__u6_addr16
 #endif
 
 #if defined(OS_WIN)
 // The type of |sockaddr::sa_family|.
 typedef ADDRESS_FAMILY sa_family_t;
 
 #define s6_addr16 u.Word
 #define ntohs(x) _byteswap_ushort(x)
 #define htons(x) _byteswap_ushort(x)
 #endif  // defined(OS_WIN)
 
 // The net address interface doesn't have a normal C -> C++ thunk since it
 // doesn't actually have any proxy wrapping or associated objects; it's just a
 // call into base. So we implement the entire interface here, using the thunk
 // namespace so it magically gets hooked up in the proper places.
 
 namespace ppapi {
 
 namespace {
 
 // Define our own net-host-net conversion, rather than reuse the one in
 // base/sys_byteorder.h, to simplify the NaCl port. NaCl has no byte swap
 // primitives.
-uint16 ConvertFromNetEndian16(uint16 x) {
+uint16_t ConvertFromNetEndian16(uint16_t x) {
 #if defined(ARCH_CPU_LITTLE_ENDIAN)
   return (x << 8) | (x >> 8);
 #else
   return x;
 #endif
 }
 
-uint16 ConvertToNetEndian16(uint16 x) {
+uint16_t ConvertToNetEndian16(uint16_t x) {
 #if defined(ARCH_CPU_LITTLE_ENDIAN)
   return (x << 8) | (x >> 8);
 #else
   return x;
 #endif
 }
 
 static const size_t kIPv4AddressSize = 4;
 static const size_t kIPv6AddressSize = 16;
 
@@ skipping 368 matching lines @@
     }
     default:
       // InitNetAddress sets net_addr->is_valid to false.
       return false;
   }
   return true;}
 
 // static
 bool NetAddressPrivateImpl::IPEndPointToNetAddress(
     const std::vector<unsigned char>& address,
-    uint16 port,
+    uint16_t port,
     PP_NetAddress_Private* addr) {
   if (!addr)
     return false;
 
   NetAddress* net_addr = InitNetAddress(addr);
   switch (address.size()) {
     case kIPv4AddressSize: {
       net_addr->is_valid = true;
       net_addr->is_ipv6 = false;
       net_addr->port = port;
@@ skipping 12 matching lines @@
       return false;
   }
 
   return true;
 }
 
 // static
 bool NetAddressPrivateImpl::NetAddressToIPEndPoint(
     const PP_NetAddress_Private& addr,
     std::vector<unsigned char>* address,
-    uint16* port) {
+    uint16_t* port) {
   if (!address || !port)
     return false;
 
   const NetAddress* net_addr = ToNetAddress(&addr);
   if (!IsValid(net_addr))
     return false;
 
   *port = net_addr->port;
   size_t address_size = GetAddressSize(net_addr);
   address->assign(&net_addr->address[0], &net_addr->address[address_size]);
@@ skipping 85 matching lines @@
   ipv6_addr->port = ConvertToNetEndian16(net_addr->port);
 
   static_assert(sizeof(ipv6_addr->addr) == kIPv6AddressSize,
                 "mismatched IPv6 address size");
   memcpy(ipv6_addr->addr, net_addr->address, kIPv6AddressSize);
 
   return true;
 }
 
 }  // namespace ppapi