Index: ppapi/proxy/ppapi_param_traits.cc |
diff --git a/ppapi/proxy/ppapi_param_traits.cc b/ppapi/proxy/ppapi_param_traits.cc |
index 2b6a826bbf6108fca12e561e23a993ea9b816d99..57f8a9f66a00407cd3895ea6c1697060efa6fd21 100644 |
--- a/ppapi/proxy/ppapi_param_traits.cc |
+++ b/ppapi/proxy/ppapi_param_traits.cc |
@@ -4,12 +4,16 @@ |
#include "ppapi/proxy/ppapi_param_traits.h" |
+#include <stddef.h> |
+#include <stdint.h> |
#include <string.h> // For memcpy |
+#include "base/macros.h" |
+#include "build/build_config.h" |
#include "ppapi/c/pp_resource.h" |
#include "ppapi/proxy/ppapi_messages.h" |
-#include "ppapi/proxy/serialized_var.h" |
#include "ppapi/proxy/serialized_flash_menu.h" |
+#include "ppapi/proxy/serialized_var.h" |
#include "ppapi/shared_impl/host_resource.h" |
#include "ppapi/shared_impl/private/ppb_x509_certificate_private_shared.h" |
@@ -156,7 +160,7 @@ void ParamTraits<PP_NetAddress_Private>::Write(Message* m, |
bool ParamTraits<PP_NetAddress_Private>::Read(const Message* m, |
base::PickleIterator* iter, |
param_type* p) { |
- uint16 size; |
+ uint16_t size; |
if (!ReadParam(m, iter, &size)) |
return false; |
if (size > sizeof(p->data)) |