The macros in thread_annotations.h (LOCKABLE, SHARED_LOCKS_REQUIRED, etc.) didn't check for an existing definition before defining a new one. This conflicts with other libraries, specifically leveldb: https://github.com/google/leveldb/blob/master/port/thread_annotations.h Change-Id: Ic37b7b63a0fbf84f183e446ee8735ef997b7099d BUG=8096 Change-Id: Ic37b7b63a0fbf84f183e446ee8735ef997b7099d Reviewed-on: https://chromium-review.googlesource.com/614441 Reviewed-by: Peter Thatcher <pthatcher@webrtc.org> Commit-Queue: Chris Mumford <cmumford@chromium.org> Cr-Commit-Position: refs/heads/master@{#19374}
Name: WebRTC URL: http://www.webrtc.org Version: 90 License: BSD License File: LICENSE Description: WebRTC provides real time voice and video processing functionality to enable the implementation of PeerConnection/MediaStream. Third party code used in this project is described in the file LICENSE_THIRD_PARTY.