Remove overridden basictypes.h.

webrtc/base/basictypes.h

 /*
  *  Copyright 2004 The WebRTC Project Authors. All rights reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
 #ifndef WEBRTC_BASE_BASICTYPES_H_
 #define WEBRTC_BASE_BASICTYPES_H_
 
 #include <stddef.h>  // for NULL, size_t

[Andrew MacDonald, 2015/09/17 17:03:14]

Needed?

[Henrik Grunell WebRTC, 2015/09/18 07:27:23]

It seems that we rely on that it's here. We include basictypes.h only at many
places were e.g. size_t is used. (Chromium does the same fwiw.) I think that's
fine.

-
-#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"

[Andrew MacDonald, 2015/09/17 17:03:13]

This doesn't appear to be needed.

[Henrik Grunell WebRTC, 2015/09/18 07:27:23]

Right, removed.

 
-#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)
+// 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;
 typedef uint64_t uint64;
-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
 
 // 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)

[Andrew MacDonald, 2015/09/17 17:03:13]

Just curious why you chose to rename these ARCH_CPU macros in this CL but not
the others in this file?

[Henrik Grunell WebRTC, 2015/09/18 07:27:23]

Well, only this one is defined in Chromium so it clashes. But maybe it's more
consistent to rename all. I'm fine with either. (I can do that in a follow-up if
this lands today.)

 // 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)
 typedef int socklen_t;
 #endif
 
 // The following only works for C++
 #ifdef __cplusplus
 #ifndef ALIGNP
 #define ALIGNP(p, t) \
     (reinterpret_cast<uint8*>(((reinterpret_cast<uintptr_t>(p) + \

[Andrew MacDonald, 2015/09/17 17:03:14]

uint8_t

[Henrik Grunell WebRTC, 2015/09/18 07:27:23]

Done.

     ((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.

[Andrew MacDonald, 2015/09/17 17:03:13]

Sorry, would you mind rewriting this?
Remove "(static T;)".

"so that it is leaked" -> "that gets leaked" 

[Henrik Grunell WebRTC, 2015/09/18 07:27:23]

Absolutely. Done.

 #define RTC_DEFINE_STATIC_LOCAL(type, name, arguments) \
   static type& name = *new type arguments
 
 #endif  // __cplusplus
 #endif  // WEBRTC_BASE_BASICTYPES_H_