Remove overridden basictypes.h.

webrtc/base/basictypes.h

Index: webrtc/base/basictypes.h
diff --git a/webrtc/base/basictypes.h b/webrtc/base/basictypes.h
index 66f2ff4b248115736cc70b12c5da84863cea76c9..cddde9c04aace6008a2f95c15cb573863f54cd9e 100644
--- a/webrtc/base/basictypes.h
+++ b/webrtc/base/basictypes.h
@@ -12,97 +12,51 @@
 #define WEBRTC_BASE_BASICTYPES_H_
 
 #include <stddef.h>  // for NULL, size_t
-
-#if !(defined(_MSC_VER) && (_MSC_VER < 1600))
 #include <stdint.h>  // for uintptr_t
-#endif
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"  // NOLINT
 #endif
 
-#include "webrtc/base/constructormagic.h"
-
-#if !defined(INT_TYPES_DEFINED)
-#define INT_TYPES_DEFINED
-#ifdef COMPILER_MSVC
-typedef unsigned __int64 uint64;
-typedef __int64 int64;
-#ifndef INT64_C
-#define INT64_C(x) x ## I64
-#endif
-#ifndef UINT64_C
-#define UINT64_C(x) x ## UI64
-#endif
-#define INT64_F "I64"
-#else  // COMPILER_MSVC
-// On Mac OS X, cssmconfig.h defines uint64 as uint64_t
-// TODO(fbarchard): Use long long for compatibility with chromium on BSD/OSX.
-#if defined(WEBRTC_MAC) && !defined(WEBRTC_IOS)
-typedef uint64_t uint64;
+// TODO(grunell): Use (u)intxx_t everywhere instead and remove these typedefs.
+typedef int8_t int8;
+typedef uint8_t uint8;
+typedef int16_t int16;
+typedef uint16_t uint16;
+typedef int32_t int32;
+typedef uint32_t uint32;
 typedef int64_t int64;
-#ifndef INT64_C
-#define INT64_C(x) x ## LL
-#endif
-#ifndef UINT64_C
-#define UINT64_C(x) x ## ULL
-#endif
-#define INT64_F "l"
-#elif defined(__LP64__)
-typedef unsigned long long uint64;  // NOLINT
-typedef long long int64;  // NOLINT
-#ifndef INT64_C
-#define INT64_C(x) x ## L
-#endif
-#ifndef UINT64_C
-#define UINT64_C(x) x ## UL
-#endif
-#define INT64_F "l"
-#else  // __LP64__
-typedef unsigned long long uint64;  // NOLINT
-typedef long long int64;  // NOLINT
-#ifndef INT64_C
-#define INT64_C(x) x ## LL
-#endif
-#ifndef UINT64_C
-#define UINT64_C(x) x ## ULL
-#endif
-#define INT64_F "ll"
-#endif  // __LP64__
-#endif  // COMPILER_MSVC
-typedef unsigned int uint32;
-typedef int int32;
-typedef unsigned short uint16;  // NOLINT
-typedef short int16;  // NOLINT
-typedef unsigned char uint8;
-typedef signed char int8;
-#endif  // INT_TYPES_DEFINED
+typedef uint64_t uint64;
 
 // Detect compiler is for x86 or x64.
 #if defined(__x86_64__) || defined(_M_X64) || \
     defined(__i386__) || defined(_M_IX86)
 #define CPU_X86 1
 #endif
+
 // Detect compiler is for arm.
 #if defined(__arm__) || defined(_M_ARM)
 #define CPU_ARM 1
 #endif
+
 #if defined(CPU_X86) && defined(CPU_ARM)
 #error CPU_X86 and CPU_ARM both defined.
 #endif
-#if !defined(ARCH_CPU_BIG_ENDIAN) && !defined(ARCH_CPU_LITTLE_ENDIAN)
+
+#if !defined(RTC_ARCH_CPU_BIG_ENDIAN) && !defined(RTC_ARCH_CPU_LITTLE_ENDIAN)
 // x86, arm or GCC provided __BYTE_ORDER__ macros
 #if CPU_X86 || CPU_ARM ||  \
   (defined(__BYTE_ORDER__) && __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__)
-#define ARCH_CPU_LITTLE_ENDIAN
+#define RTC_ARCH_CPU_LITTLE_ENDIAN
 #elif defined(__BYTE_ORDER__) && __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
-#define ARCH_CPU_BIG_ENDIAN
+#define RTC_ARCH_CPU_BIG_ENDIAN
 #else
-#error ARCH_CPU_BIG_ENDIAN or ARCH_CPU_LITTLE_ENDIAN should be defined.
+#error RTC_ARCH_CPU_BIG_ENDIAN or RTC_ARCH_CPU_LITTLE_ENDIAN should be defined.
 #endif
 #endif
-#if defined(ARCH_CPU_BIG_ENDIAN) && defined(ARCH_CPU_LITTLE_ENDIAN)
-#error ARCH_CPU_BIG_ENDIAN and ARCH_CPU_LITTLE_ENDIAN both defined.
+
+#if defined(RTC_ARCH_CPU_BIG_ENDIAN) && defined(RTC_ARCH_CPU_LITTLE_ENDIAN)
+#error RTC_ARCH_CPU_BIG_ENDIAN and RTC_ARCH_CPU_LITTLE_ENDIAN both defined.
 #endif
 
 #if defined(WEBRTC_WIN)
@@ -111,17 +65,20 @@ typedef int socklen_t;
 
 // The following only works for C++
 #ifdef __cplusplus
+
 #ifndef ALIGNP
-#define ALIGNP(p, t) \
-    (reinterpret_cast<uint8*>(((reinterpret_cast<uintptr_t>(p) + \
-    ((t) - 1)) & ~((t) - 1))))
+#define ALIGNP(p, t)                                             \
+  (reinterpret_cast<uint8_t*>(((reinterpret_cast<uintptr_t>(p) + \
+  ((t) - 1)) & ~((t) - 1))))
 #endif
+
 #define RTC_IS_ALIGNED(p, a) (!((uintptr_t)(p) & ((a) - 1)))
 
-// Use these to declare and define a static local variable (static T;) so that
-// it is leaked so that its destructors are not called at exit.
+// Use these to declare and define a static local variable that gets leaked so
+// that its destructors are not called at exit.
 #define RTC_DEFINE_STATIC_LOCAL(type, name, arguments) \
   static type& name = *new type arguments
 
 #endif  // __cplusplus
+
 #endif  // WEBRTC_BASE_BASICTYPES_H_