| Index: base/atomicops.h
|
| diff --git a/base/atomicops.h b/base/atomicops.h
|
| index 7f03492e84969638538da16b7ad9b713eb24d827..3d15e03211a82cd98e1dd4dc6c8c82111d686046 100644
|
| --- a/base/atomicops.h
|
| +++ b/base/atomicops.h
|
| @@ -28,7 +28,8 @@
|
| #ifndef BASE_ATOMICOPS_H_
|
| #define BASE_ATOMICOPS_H_
|
|
|
| -#include "base/basictypes.h"
|
| +#include <stdint.h>
|
| +
|
| #include "build/build_config.h"
|
|
|
| #if defined(OS_WIN) && defined(ARCH_CPU_64_BITS)
|
| @@ -43,7 +44,7 @@
|
| namespace base {
|
| namespace subtle {
|
|
|
| -typedef int32 Atomic32;
|
| +typedef int32_t Atomic32;
|
| #ifdef ARCH_CPU_64_BITS
|
| // We need to be able to go between Atomic64 and AtomicWord implicitly. This
|
| // means Atomic64 and AtomicWord should be the same type on 64-bit.
|
|
|