| Index: third_party/tcmalloc/chromium/src/windows/gperftools/tcmalloc.h.in
|
| diff --git a/third_party/tcmalloc/chromium/src/windows/google/tcmalloc.h.in b/third_party/tcmalloc/chromium/src/windows/gperftools/tcmalloc.h.in
|
| similarity index 94%
|
| rename from third_party/tcmalloc/chromium/src/windows/google/tcmalloc.h.in
|
| rename to third_party/tcmalloc/chromium/src/windows/gperftools/tcmalloc.h.in
|
| index a031b35d7c70c689be926fcefe0db91f4aad0a52..d09ec953622e0a9eb8e7c6cec2bd471bef97ea0c 100644
|
| --- a/third_party/tcmalloc/chromium/src/windows/google/tcmalloc.h.in
|
| +++ b/third_party/tcmalloc/chromium/src/windows/gperftools/tcmalloc.h.in
|
| @@ -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.
|
| @@ -46,7 +51,7 @@
|
| #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_STRING "gperftools @TC_VERSION_MAJOR@.@TC_VERSION_MINOR@@TC_VERSION_PATCH@"
|
|
|
| #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
|
|
|