zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

libvpx's UNUSED macro conflicts with webrtc/base's. Added missing include of assert.h. Globally defined function "Unused" in talk/base and its copy (webrtc/base) is causing a conflict.

Browse Source 
libvpx macro (UNUSED) can be found here:
http://src.chromium.org/viewvc/chrome/trunk/deps/third_party/libvpx/source/libvpx/vpx/vpx_codec.h

BUG=N/A
R=andrew@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/17489004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@6185 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
henrike@webrtc.org
2014-05-16 16:54:44 +00:00
parent a3b5673879
commit 14abcc7322
6 changed files with 25 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
webrtc/base/opensslstreamadapter.cc
View File

@ -144,8 +144,8 @@ static int stream_puts(BIO* b, const char* str) {
}
static long stream_ctrl(BIO* b, int cmd, long num, void* ptr) {
UNUSED(num);
UNUSED(ptr);
RTC_UNUSED(num);
RTC_UNUSED(ptr);
switch (cmd) {
case BIO_CTRL_RESET: