diff options
Diffstat (limited to 'chromium/ppapi/utility/threading/simple_thread.h')
| -rw-r--r-- | chromium/ppapi/utility/threading/simple_thread.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/chromium/ppapi/utility/threading/simple_thread.h b/chromium/ppapi/utility/threading/simple_thread.h index b4d7114cc4e..d10c8599654 100644 --- a/chromium/ppapi/utility/threading/simple_thread.h +++ b/chromium/ppapi/utility/threading/simple_thread.h @@ -8,6 +8,9 @@ #include <stddef.h> #ifdef WIN32 #include <windows.h> +// MemoryBarrier is a Win32 macro that clashes with MemoryBarrier in +// base/atomicops.h. +#undef MemoryBarrier #else #include <pthread.h> #endif |