generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.

Browse Source 
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
This commit is contained in:
henrike@webrtc.org 2014-05-21 16:52:14 +00:00
parent ce4201df52
commit a148704b4b
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
webrtc/base/basictypes.h
View File

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

2
webrtc/overrides/webrtc/base/basictypes.h
View File

@ -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))))