diff options
| author | timurrrr@chromium.org <timurrrr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-07 09:47:34 +0000 |
|---|---|---|
| committer | timurrrr@chromium.org <timurrrr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-07 09:47:34 +0000 |
| commit | a46b265eb9bb438adaefdbf574fd638df0894e15 (patch) | |
| tree | c013c52bde487bc653ab855239abc85d0f239e46 /base/dynamic_annotations.h | |
| parent | b61e0e205a0945ad3c500447390c98967212e77a (diff) | |
| download | chromium_src-a46b265eb9bb438adaefdbf574fd638df0894e15.zip chromium_src-a46b265eb9bb438adaefdbf574fd638df0894e15.tar.gz chromium_src-a46b265eb9bb438adaefdbf574fd638df0894e15.tar.bz2 | |
Fix the dynamic_annotations build issues on Windows
Review URL: http://codereview.chromium.org/1997007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@46670 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/dynamic_annotations.h')
| -rw-r--r-- | base/dynamic_annotations.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/base/dynamic_annotations.h b/base/dynamic_annotations.h index 23a2a27..a6ed91e 100644 --- a/base/dynamic_annotations.h +++ b/base/dynamic_annotations.h @@ -26,7 +26,12 @@ #ifndef BASE_DYNAMIC_ANNOTATIONS_H_ #define BASE_DYNAMIC_ANNOTATIONS_H_ +#ifdef __GNUC__ +// valgrind.h uses gcc extensions so it may not build with other compilers. +// Also, it defines NVALGRIND on Windows, which disables dynamic annotations +// for ThreadSanitizer. #include "base/third_party/valgrind/valgrind.h" +#endif #ifndef NVALGRIND // ------------------------------------------------------------- |