| Index: webrtc/base/basictypes.h
|
| diff --git a/webrtc/base/basictypes.h b/webrtc/base/basictypes.h
|
| index 87dcdc6d11c87e059455dab1de6994a6b6985de4..42ffa5a62e1521647291315306a83260a5833f38 100644
|
| --- a/webrtc/base/basictypes.h
|
| +++ b/webrtc/base/basictypes.h
|
| @@ -11,60 +11,9 @@
|
| #ifndef WEBRTC_BASE_BASICTYPES_H_
|
| #define WEBRTC_BASE_BASICTYPES_H_
|
|
|
| -#include <stddef.h> // for NULL, size_t
|
| -#include <stdint.h> // for uintptr_t and (u)int_t types.
|
|
|
| -// 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(RTC_ARCH_CPU_BIG_ENDIAN) && !defined(RTC_ARCH_CPU_LITTLE_ENDIAN)
|
| -// x86, arm or GCC provided __BYTE_ORDER__ macros
|
| -#if defined(CPU_X86) || defined(CPU_ARM) || \
|
| - (defined(__BYTE_ORDER__) && __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__)
|
| -#define RTC_ARCH_CPU_LITTLE_ENDIAN
|
| -#elif defined(__BYTE_ORDER__) && __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
|
| -#define RTC_ARCH_CPU_BIG_ENDIAN
|
| -#else
|
| -#error RTC_ARCH_CPU_BIG_ENDIAN or RTC_ARCH_CPU_LITTLE_ENDIAN should be defined.
|
| -#endif
|
| -#endif
|
| -
|
| -#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_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 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
|
| +// This header is deprecated and is just left here temporarily during
|
| +// refactoring. See https://bugs.webrtc.org/7634 for more details.
|
| +#include "webrtc/rtc_base/basictypes.h"
|
|
|
| #endif // WEBRTC_BASE_BASICTYPES_H_
|
|
|