From 51f6c2793adab2d864b3d2b360000ef8db1d3e92 Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Mon, 10 Dec 2018 16:19:40 +0100 Subject: BASELINE: Update Chromium to 71.0.3578.93 Change-Id: I6a32086c33670e1b033f8b10e6bf1fd4da1d105d Reviewed-by: Alexandru Croitor --- chromium/base/thread_annotations.h | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'chromium/base/thread_annotations.h') diff --git a/chromium/base/thread_annotations.h b/chromium/base/thread_annotations.h index ba7168b13f7..bba3ed7c2fd 100644 --- a/chromium/base/thread_annotations.h +++ b/chromium/base/thread_annotations.h @@ -29,8 +29,10 @@ // you want to refer to is not in scope, you may use a member pointer // (e.g. &MyClass::mutex_) to refer to a mutex in some (unknown) object. -#ifndef THREAD_ANNOTATIONS_H_ -#define THREAD_ANNOTATIONS_H_ +#ifndef BASE_THREAD_ANNOTATIONS_H_ +#define BASE_THREAD_ANNOTATIONS_H_ + +#include "build/build_config.h" #if defined(__clang__) #define THREAD_ANNOTATION_ATTRIBUTE__(x) __attribute__((x)) @@ -235,4 +237,4 @@ inline T& ts_unchecked_read(T& v) NO_THREAD_SAFETY_ANALYSIS { } // namespace thread_safety_analysis -#endif // _BASE_THREAD_ANNOTATIONS_H_ +#endif // BASE_THREAD_ANNOTATIONS_H_ -- cgit v1.2.1