| Index: third_party/libaddressinput/chromium/override/basictypes_override.h
|
| diff --git a/third_party/libaddressinput/chromium/override/basictypes_override.h b/third_party/libaddressinput/chromium/override/basictypes_override.h
|
| index 1a8274ffcf3f4924a169742a820dbc1e6059340d..651f506c7903c742011bc169670bef8bd5dd8113 100644
|
| --- a/third_party/libaddressinput/chromium/override/basictypes_override.h
|
| +++ b/third_party/libaddressinput/chromium/override/basictypes_override.h
|
| @@ -5,8 +5,26 @@
|
| #ifndef THIRD_PARTY_LIBADDRESSINPUT_CHROMIUM_BASICTYPES_OVERRIDE_H_
|
| #define THIRD_PARTY_LIBADDRESSINPUT_CHROMIUM_BASICTYPES_OVERRIDE_H_
|
|
|
| -#include "base/basictypes.h"
|
| +#include <limits.h>
|
| +#include <stddef.h>
|
| +#include <stdint.h>
|
| +
|
| +#include "base/macros.h"
|
| +
|
| +// There is no more base/basictypes.h in Chromium. Even though libaddressinput
|
| +// has its own "basictypes.h" that defines a whole host of custom integers of
|
| +// specific lengths, the only one actually used is |uint32| in util/md5.cc. So
|
| +// here you go:
|
| +
|
| +typedef uint32_t uint32;
|
| +
|
| +// TODO: Switch libaddressinput to |uint32_t|.
|
| +
|
| +// Also, Chromium uses the C++11 |static_assert|, so here's a definition for the
|
| +// old COMPILE_ASSERT:
|
|
|
| #define COMPILE_ASSERT(expr, msg) static_assert(expr, #msg)
|
|
|
| +// TODO: Switch libaddressinput to |static_assert|.
|
| +
|
| #endif // THIRD_PARTY_LIBADDRESSINPUT_CHROMIUM_BASICTYPES_OVERRIDE_H_
|
|
|