diff options
| author | sgk@chromium.org <sgk@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-25 23:31:03 +0000 |
|---|---|---|
| committer | sgk@chromium.org <sgk@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-25 23:31:03 +0000 |
| commit | 165349b753d41461e75903b42f79efd741a18472 (patch) | |
| tree | eb0c0024738ba754a8c3b4936e6816ae80001839 /third_party/tcmalloc/chromium/src/symbolize.h | |
| parent | 1e625a41a9145a10c4c003f081f408ca59fea8cb (diff) | |
| download | chromium_src-165349b753d41461e75903b42f79efd741a18472.zip chromium_src-165349b753d41461e75903b42f79efd741a18472.tar.gz chromium_src-165349b753d41461e75903b42f79efd741a18472.tar.bz2 | |
Merge r77 from upstream tcmalloc to the local chromium branch.
BUG=27911
TEST=none
Review URL: http://codereview.chromium.org/440027
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@33151 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party/tcmalloc/chromium/src/symbolize.h')
| -rw-r--r-- | third_party/tcmalloc/chromium/src/symbolize.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/third_party/tcmalloc/chromium/src/symbolize.h b/third_party/tcmalloc/chromium/src/symbolize.h index 8fb0366..72196f6 100644 --- a/third_party/tcmalloc/chromium/src/symbolize.h +++ b/third_party/tcmalloc/chromium/src/symbolize.h @@ -33,10 +33,6 @@ #ifndef TCMALLOC_SYMBOLIZE_H_ #define TCMALLOC_SYMBOLIZE_H_ -#include "config.h" -#ifdef HAVE_STDINT_H -#include <stdint.h> // for uintptr_t -#endif #include <map> using std::map; @@ -46,7 +42,7 @@ static const int kSymbolSize = 1024; // TODO(glider): it's better to make SymbolMap a class that encapsulates the // address operations and has the Symbolize() method. -typedef map<uintptr_t, const char*> SymbolMap; +typedef map<uintptr_t, char*> SymbolMap; extern bool Symbolize(char *out, int out_size, SymbolMap *symbolization_table); |