Index: third_party/tcmalloc/chromium/src/windows/google/tcmalloc.h |
diff --git a/third_party/tcmalloc/chromium/src/windows/google/tcmalloc.h b/third_party/tcmalloc/chromium/src/windows/google/tcmalloc.h |
index f6c17f5c2d3b417fc745bed56c12c46fb5247f45..c7db6319426c4bce05d4186a38412d3aca4492c2 100644 |
--- a/third_party/tcmalloc/chromium/src/windows/google/tcmalloc.h |
+++ b/third_party/tcmalloc/chromium/src/windows/google/tcmalloc.h |
@@ -26,91 +26,9 @@ |
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
- * |
- * --- |
- * Author: Sanjay Ghemawat <opensource@google.com> |
- * .h file by Craig Silverstein <opensource@google.com> |
*/ |
-#ifndef TCMALLOC_TCMALLOC_H_ |
-#define TCMALLOC_TCMALLOC_H_ |
- |
-// __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. |
-#ifndef __THROW /* I guess we're not on a glibc system */ |
-# define __THROW /* __THROW is just an optimization, so ok to make it "" */ |
-#endif |
- |
-// Define the version number so folks can check against it |
-#define TC_VERSION_MAJOR 1 |
-#define TC_VERSION_MINOR 7 |
-#define TC_VERSION_PATCH "" |
-#define TC_VERSION_STRING "google-perftools 1.7" |
- |
-#include <stdlib.h> // for struct mallinfo, if it's defined |
- |
-// Annoying stuff for windows -- makes sure clients can import these functions |
-#ifndef PERFTOOLS_DLL_DECL |
-# ifdef _WIN32 |
-# define PERFTOOLS_DLL_DECL __declspec(dllimport) |
-# else |
-# define PERFTOOLS_DLL_DECL |
-# endif |
-#endif |
- |
-#ifdef __cplusplus |
-#include <new> // for std::nothrow_t |
- |
-extern "C" { |
-#endif |
- // Returns a human-readable version string. If major, minor, |
- // and/or patch are not NULL, they are set to the major version, |
- // minor version, and patch-code (a string, usually ""). |
- PERFTOOLS_DLL_DECL const char* tc_version(int* major, int* minor, |
- const char** patch) __THROW; |
- |
- PERFTOOLS_DLL_DECL void* tc_malloc(size_t size) __THROW; |
- PERFTOOLS_DLL_DECL void tc_free(void* ptr) __THROW; |
- PERFTOOLS_DLL_DECL void* tc_realloc(void* ptr, size_t size) __THROW; |
- PERFTOOLS_DLL_DECL void* tc_calloc(size_t nmemb, size_t size) __THROW; |
- PERFTOOLS_DLL_DECL void tc_cfree(void* ptr) __THROW; |
- |
- PERFTOOLS_DLL_DECL void* tc_memalign(size_t __alignment, |
- size_t __size) __THROW; |
- PERFTOOLS_DLL_DECL int tc_posix_memalign(void** ptr, |
- size_t align, size_t size) __THROW; |
- PERFTOOLS_DLL_DECL void* tc_valloc(size_t __size) __THROW; |
- PERFTOOLS_DLL_DECL void* tc_pvalloc(size_t __size) __THROW; |
- |
- PERFTOOLS_DLL_DECL void tc_malloc_stats(void) __THROW; |
- PERFTOOLS_DLL_DECL int tc_mallopt(int cmd, int value) __THROW; |
-#if 0 |
- PERFTOOLS_DLL_DECL struct mallinfo tc_mallinfo(void) __THROW; |
-#endif |
- |
- // This is an alias for MallocExtension::instance()->GetAllocatedSize(). |
- // It is equivalent to |
- // OS X: malloc_size() |
- // glibc: malloc_usable_size() |
- // Windows: _msize() |
- PERFTOOLS_DLL_DECL size_t tc_malloc_size(void* ptr) __THROW; |
- |
-#ifdef __cplusplus |
- PERFTOOLS_DLL_DECL int tc_set_new_mode(int flag) __THROW; |
- PERFTOOLS_DLL_DECL void* tc_new(size_t size); |
- PERFTOOLS_DLL_DECL void* tc_new_nothrow(size_t size, |
- const std::nothrow_t&) __THROW; |
- PERFTOOLS_DLL_DECL void tc_delete(void* p) __THROW; |
- PERFTOOLS_DLL_DECL void tc_delete_nothrow(void* p, |
- const std::nothrow_t&) __THROW; |
- PERFTOOLS_DLL_DECL void* tc_newarray(size_t size); |
- PERFTOOLS_DLL_DECL void* tc_newarray_nothrow(size_t size, |
- const std::nothrow_t&) __THROW; |
- PERFTOOLS_DLL_DECL void tc_deletearray(void* p) __THROW; |
- PERFTOOLS_DLL_DECL void tc_deletearray_nothrow(void* p, |
- const std::nothrow_t&) __THROW; |
-} |
-#endif |
- |
-#endif // #ifndef TCMALLOC_TCMALLOC_H_ |
+/* The code has moved to gperftools/. Use that include-directory for |
+ * new code. |
+ */ |
+#include <gperftools/tcmalloc.h> |