| commit | 5199d1ddc1a2d8bb9feeadc5bc684f8a1fd6b76b | [log] [tgz] |
|---|---|---|
| author | henrike@webrtc.org <henrike@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | Fri May 16 16:54:44 2014 +0000 |
| committer | henrike@webrtc.org <henrike@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | Fri May 16 16:54:44 2014 +0000 |
| tree | e9a474097c700880b24d1cfdf8c6e80301fe9a37 | |
| parent | e3acf539cc055732c049274c21314cce5ce82599 [diff] [blame] |
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. 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/webrtc@6185 4adac7df-926f-26a2-2b94-8c16560cd09d
diff --git a/base/httpserver.cc b/base/httpserver.cc index caa58ef..0d22584 100644 --- a/base/httpserver.cc +++ b/base/httpserver.cc
@@ -222,7 +222,7 @@ void HttpServer::Connection::onHttpClosed(HttpError err) { - UNUSED(err); + RTC_UNUSED(err); server_->Remove(connection_id_); }