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

Unified Diff: third_party/tcmalloc/chromium/src/windows/gperftools/tcmalloc.h

Issue 9666033: Experiment for updating the tcmalloc chromium branch to r144 (gperftools 2.0). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 9 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/windows/gperftools/tcmalloc.h
diff --git a/third_party/tcmalloc/chromium/src/windows/google/tcmalloc.h.in b/third_party/tcmalloc/chromium/src/windows/gperftools/tcmalloc.h
similarity index 94%
copy from third_party/tcmalloc/chromium/src/windows/google/tcmalloc.h.in
copy to third_party/tcmalloc/chromium/src/windows/gperftools/tcmalloc.h
index a031b35d7c70c689be926fcefe0db91f4aad0a52..db32c5366abc8d05723e1126526228552abecf7f 100644
--- a/third_party/tcmalloc/chromium/src/windows/google/tcmalloc.h.in
+++ b/third_party/tcmalloc/chromium/src/windows/gperftools/tcmalloc.h
@@ -35,6 +35,11 @@
#ifndef TCMALLOC_TCMALLOC_H_
#define TCMALLOC_TCMALLOC_H_
+#include <stddef.h> // for size_t
+#ifdef HAVE_SYS_CDEFS_H
+#include <sys/cdefs.h> // where glibc defines __THROW
+#endif
+
// __THROW is defined in glibc systems. It means, counter-intuitively,
// "This function will never throw an exception." It's an optional
// optimization tool, but we may need to use it to match glibc prototypes.
@@ -43,10 +48,10 @@
#endif
// Define the version number so folks can check against it
-#define TC_VERSION_MAJOR @TC_VERSION_MAJOR@
-#define TC_VERSION_MINOR @TC_VERSION_MINOR@
-#define TC_VERSION_PATCH "@TC_VERSION_PATCH@"
-#define TC_VERSION_STRING "google-perftools @TC_VERSION_MAJOR@.@TC_VERSION_MINOR@@TC_VERSION_PATCH@"
+#define TC_VERSION_MAJOR 2
+#define TC_VERSION_MINOR 0
+#define TC_VERSION_PATCH ""
+#define TC_VERSION_STRING "gperftools 2.0"
#include <stdlib.h> // for struct mallinfo, if it's defined
@@ -60,7 +65,9 @@
#endif
#ifdef __cplusplus
-#include <new> // for std::nothrow_t
+namespace std {
+struct nothrow_t;
+}
extern "C" {
#endif

Powered by Google App Engine
This is Rietveld 408576698