Chris Mumford 0ed6de4cad Check for prior thread annotation macros before defining.
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}
2017-08-16 17:31:58 +00:00
..
2017-07-19 17:40:47 +00:00
2017-07-10 10:00:30 +00:00
2017-07-19 17:40:47 +00:00
2017-07-19 17:40:47 +00:00