Index: third_party/tcmalloc/chromium/src/stacktrace_nacl-inl.h |
diff --git a/third_party/tcmalloc/chromium/src/base/googleinit.h b/third_party/tcmalloc/chromium/src/stacktrace_nacl-inl.h |
similarity index 70% |
copy from third_party/tcmalloc/chromium/src/base/googleinit.h |
copy to third_party/tcmalloc/chromium/src/stacktrace_nacl-inl.h |
index 62ad84c60251665e5e8fae2139d0714457bc838f..7467e7541108e2736be8beb9c3b731dc8f0aec4d 100644 |
--- a/third_party/tcmalloc/chromium/src/base/googleinit.h |
+++ b/third_party/tcmalloc/chromium/src/stacktrace_nacl-inl.h |
@@ -1,10 +1,10 @@ |
-// Copyright (c) 2005, Google Inc. |
+// Copyright (c) 2011, Google Inc. |
// All rights reserved. |
-// |
+// |
// Redistribution and use in source and binary forms, with or without |
// modification, are permitted provided that the following conditions are |
// met: |
-// |
+// |
// * Redistributions of source code must retain the above copyright |
// notice, this list of conditions and the following disclaimer. |
// * Redistributions in binary form must reproduce the above |
@@ -14,7 +14,7 @@ |
// * Neither the name of Google Inc. nor the names of its |
// contributors may be used to endorse or promote products derived from |
// this software without specific prior written permission. |
-// |
+// |
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS |
// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT |
// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR |
@@ -28,24 +28,10 @@ |
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
// --- |
-// Author: Jacob Hoffman-Andrews |
+// Author: Ivan Krasin |
+// |
+// Native Client stub for stacktrace. |
-#ifndef _GOOGLEINIT_H |
-#define _GOOGLEINIT_H |
- |
-class GoogleInitializer { |
- public: |
- typedef void (*void_function)(void); |
- GoogleInitializer(const char* name, void_function f) { |
- f(); |
- } |
-}; |
- |
-#define REGISTER_MODULE_INITIALIZER(name, body) \ |
- namespace { \ |
- static void google_init_module_##name () { body; } \ |
- GoogleInitializer google_initializer_module_##name(#name, \ |
- google_init_module_##name); \ |
- } |
- |
-#endif /* _GOOGLEINIT_H */ |
+int GET_STACK_TRACE_OR_FRAMES { |
+ return 0; |
+} |