| Index: base/pickle.cc
 | 
| diff --git a/base/pickle.cc b/base/pickle.cc
 | 
| index 678c425e9439b76c24acfab1638b286ada81ed73..d83391bb524194b212a1f86ea0da26c1befd84ea 100644
 | 
| --- a/base/pickle.cc
 | 
| +++ b/base/pickle.cc
 | 
| @@ -11,6 +11,7 @@
 | 
|  
 | 
|  #include "base/bits.h"
 | 
|  #include "base/macros.h"
 | 
| +#include "build/build_config.h"
 | 
|  
 | 
|  namespace base {
 | 
|  
 | 
| @@ -71,7 +72,7 @@ const char* PickleIterator::GetReadPointerAndAdvance(int num_bytes) {
 | 
|  inline const char* PickleIterator::GetReadPointerAndAdvance(
 | 
|      int num_elements,
 | 
|      size_t size_element) {
 | 
| -  // Check for int32 overflow.
 | 
| +  // Check for int32_t overflow.
 | 
|    int64_t num_bytes = static_cast<int64_t>(num_elements) * size_element;
 | 
|    int num_bytes32 = static_cast<int>(num_bytes);
 | 
|    if (num_bytes != static_cast<int64_t>(num_bytes32))
 | 
| 
 |