Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(42)

Unified Diff: third_party/tcmalloc/chromium/src/base/spinlock_internal.cc

Issue 7430007: Merge tcmalloc r111 (perftools v. 1.8) with the chromium/ branch. Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/tcmalloc/chromium/src/base/spinlock_internal.cc
===================================================================
--- third_party/tcmalloc/chromium/src/base/spinlock_internal.cc (revision 94429)
+++ third_party/tcmalloc/chromium/src/base/spinlock_internal.cc (working copy)
@@ -44,7 +44,7 @@
#if defined(_WIN32)
#include "base/spinlock_win32-inl.h"
-#elif defined(__linux__)
+#elif defined(__linux__) && !defined(__native_client__)
jar (doing other things) 2011/07/31 08:19:39 I was expecting items provided by more mainstream
#include "base/spinlock_linux-inl.h"
#else
#include "base/spinlock_posix-inl.h"

Powered by Google App Engine
This is Rietveld 408576698