From a148704b4b184f367167acf2772a1dbb88172f94 Mon Sep 17 00:00:00 2001 From: "henrike@webrtc.org" Date: Wed, 21 May 2014 16:52:14 +0000 Subject: [PATCH] Rename webrtc/base's IS_ALIGNED macro to RTC_IS_ALIGNED to avoid conflict between webrtc/base/basictypes.h and third_party/.../vpx_codec.h. BUG=3380 R=andrew@webrtc.org Review URL: https://webrtc-codereview.appspot.com/17579005 git-svn-id: http://webrtc.googlecode.com/svn/trunk@6215 4adac7df-926f-26a2-2b94-8c16560cd09d --- webrtc/base/basictypes.h | 2 +- webrtc/overrides/webrtc/base/basictypes.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/webrtc/base/basictypes.h b/webrtc/base/basictypes.h index 8c6909497d..7649a43f85 100644 --- a/webrtc/base/basictypes.h +++ b/webrtc/base/basictypes.h @@ -123,7 +123,7 @@ namespace rtc { #define ALIGNP(p, t) \ (reinterpret_cast(((reinterpret_cast(p) + \ ((t) - 1)) & ~((t) - 1)))) -#define IS_ALIGNED(p, a) (!((uintptr_t)(p) & ((a) - 1))) +#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. diff --git a/webrtc/overrides/webrtc/base/basictypes.h b/webrtc/overrides/webrtc/base/basictypes.h index cd93d06ed7..c7cec5e7a4 100644 --- a/webrtc/overrides/webrtc/base/basictypes.h +++ b/webrtc/overrides/webrtc/base/basictypes.h @@ -95,7 +95,7 @@ const int kForever = -1; #else // !WEBRTC_WIN #define alignof(t) __alignof__(t) #endif // !WEBRTC_WIN -#define IS_ALIGNED(p, a) (0==(reinterpret_cast(p) & ((a)-1))) +#define RTC_IS_ALIGNED(p, a) (0==(reinterpret_cast(p) & ((a)-1))) #define ALIGNP(p, t) \ (reinterpret_cast(((reinterpret_cast(p) + \ ((t)-1)) & ~((t)-1))))