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

Unified Diff: third_party/tcmalloc/chromium/src/sampler.h

Issue 7050034: Merge google-perftools r109 (the current contents of third_party/tcmalloc/vendor) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 years, 7 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/sampler.h
===================================================================
--- third_party/tcmalloc/chromium/src/sampler.h (revision 87277)
+++ third_party/tcmalloc/chromium/src/sampler.h (working copy)
@@ -36,8 +36,13 @@
#define TCMALLOC_SAMPLER_H_
#include "config.h"
-#include "common.h"
-#include "static_vars.h"
+#include <stddef.h> // for size_t
+#ifdef HAVE_STDINT_H
+#include <stdint.h> // for uint64_t, uint32_t, int32_t
+#endif
+#include <string.h> // for memcpy
+#include "base/basictypes.h" // for ASSERT
+#include "internal_logging.h" // for ASSERT
namespace tcmalloc {

Powered by Google App Engine
This is Rietveld 408576698