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

Unified Diff: third_party/tcmalloc/chromium/src/stacktrace.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/stacktrace.cc
===================================================================
--- third_party/tcmalloc/chromium/src/stacktrace.cc (revision 94429)
+++ third_party/tcmalloc/chromium/src/stacktrace.cc (working copy)
@@ -99,11 +99,12 @@
#elif 0
// This is for the benefit of code analysis tools that may have
// trouble with the computed #include above.
-# include "base/stacktrace_x86-inl.h"
-# include "base/stacktrace_libunwind-inl.h"
-# include "base/stacktrace_generic-inl.h"
-# include "base/stacktrace_powerpc-inl.h"
-# include "base/stacktrace_win32-inl.h"
+# include "stacktrace_x86-inl.h"
+# include "stacktrace_libunwind-inl.h"
+# include "stacktrace_generic-inl.h"
+# include "stacktrace_powerpc-inl.h"
+# include "stacktrace_nacl-inl.h"
+# include "stacktrace_win32-inl.h"
#else
# error Cannot calculate stack trace: will need to write for your environment
#endif

Powered by Google App Engine
This is Rietveld 408576698