diff options
| author | henrike@webrtc.org <henrike@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2014-05-21 16:52:14 +0000 |
|---|---|---|
| committer | henrike@webrtc.org <henrike@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2014-05-21 16:52:14 +0000 |
| commit | f85a9afbbb9b91c7712bc6fe5775b57f47e642c6 (patch) | |
| tree | 9f3c4e1737f9287ea1bc1fa661580c1a47c96c6e | |
| parent | b45df1c14edcfe5efac5df2238adad62bb187b06 (diff) | |
| download | webrtc-f85a9afbbb9b91c7712bc6fe5775b57f47e642c6.tar.gz | |
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/webrtc@6215 4adac7df-926f-26a2-2b94-8c16560cd09d
| -rw-r--r-- | base/basictypes.h | 2 | ||||
| -rw-r--r-- | overrides/webrtc/base/basictypes.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/base/basictypes.h b/base/basictypes.h index 8c690949..7649a43f 100644 --- a/base/basictypes.h +++ b/base/basictypes.h @@ -123,7 +123,7 @@ namespace rtc { #define ALIGNP(p, t) \ (reinterpret_cast<uint8*>(((reinterpret_cast<uintptr_t>(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/overrides/webrtc/base/basictypes.h b/overrides/webrtc/base/basictypes.h index cd93d06e..c7cec5e7 100644 --- a/overrides/webrtc/base/basictypes.h +++ b/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<uintptr_t>(p) & ((a)-1))) +#define RTC_IS_ALIGNED(p, a) (0==(reinterpret_cast<uintptr_t>(p) & ((a)-1))) #define ALIGNP(p, t) \ (reinterpret_cast<uint8*>(((reinterpret_cast<uintptr_t>(p) + \ ((t)-1)) & ~((t)-1)))) |