[Avida-SVN] r3472 - branches/tcmalloc-1.4/source/platform/tcmalloc-1.4

[brysonda at myxo.css.msu.edu]

Author: brysonda
Date: 2009-10-14 11:52:40 -0400 (Wed, 14 Oct 2009)
New Revision: 3472

Modified:
   branches/tcmalloc-1.4/source/platform/tcmalloc-1.4/stacktrace.cc
   branches/tcmalloc-1.4/source/platform/tcmalloc-1.4/stacktrace_generic-inl.h
   branches/tcmalloc-1.4/source/platform/tcmalloc-1.4/stacktrace_libunwind-inl.h
   branches/tcmalloc-1.4/source/platform/tcmalloc-1.4/stacktrace_powerpc-inl.h
   branches/tcmalloc-1.4/source/platform/tcmalloc-1.4/stacktrace_win32-inl.h
   branches/tcmalloc-1.4/source/platform/tcmalloc-1.4/stacktrace_x86_64-inl.h
   branches/tcmalloc-1.4/source/platform/tcmalloc-1.4/vdso_support.h
Log:
Correct some additional header includes that affect other platforms.

Modified: branches/tcmalloc-1.4/source/platform/tcmalloc-1.4/stacktrace.cc
===================================================================
--- branches/tcmalloc-1.4/source/platform/tcmalloc-1.4/stacktrace.cc	2009-10-14 15:49:40 UTC (rev 3471)
+++ branches/tcmalloc-1.4/source/platform/tcmalloc-1.4/stacktrace.cc	2009-10-14 15:52:40 UTC (rev 3472)
@@ -61,11 +61,11 @@
 #elif 0
 // This is for the benefit of code analysis tools that may have
 // trouble with the computed #include above.
-# include "base/stacktrace_x86-inl.h"
-# include "base/stacktrace_libunwind-inl.h"
-# include "base/stacktrace_generic-inl.h"
-# include "base/stacktrace_powerpc-inl.h"
-# include "base/stacktrace_win32-inl.h"
+# include "stacktrace_x86-inl.h"
+# include "stacktrace_libunwind-inl.h"
+# include "stacktrace_generic-inl.h"
+# include "stacktrace_powerpc-inl.h"
+# include "stacktrace_win32-inl.h"
 #else
 # error Cannot calculate stack trace: will need to write for your environment
 #endif

Modified: branches/tcmalloc-1.4/source/platform/tcmalloc-1.4/stacktrace_generic-inl.h
===================================================================
--- branches/tcmalloc-1.4/source/platform/tcmalloc-1.4/stacktrace_generic-inl.h	2009-10-14 15:49:40 UTC (rev 3471)
+++ branches/tcmalloc-1.4/source/platform/tcmalloc-1.4/stacktrace_generic-inl.h	2009-10-14 15:52:40 UTC (rev 3472)
@@ -36,7 +36,7 @@
 // This can cause a deadlock in HeapProfiler.
 #include <execinfo.h>
 #include <string.h>
-#include "google/stacktrace.h"
+#include "stacktrace.h"
 
 // If you change this function, also change GetStackFrames below.
 int GetStackTrace(void** result, int max_depth, int skip_count) {

Modified: branches/tcmalloc-1.4/source/platform/tcmalloc-1.4/stacktrace_libunwind-inl.h
===================================================================
--- branches/tcmalloc-1.4/source/platform/tcmalloc-1.4/stacktrace_libunwind-inl.h	2009-10-14 15:49:40 UTC (rev 3471)
+++ branches/tcmalloc-1.4/source/platform/tcmalloc-1.4/stacktrace_libunwind-inl.h	2009-10-14 15:52:40 UTC (rev 3472)
@@ -40,9 +40,9 @@
 #include <string.h>   // for memset()
 #include <libunwind.h>
 }
-#include "google/stacktrace.h"
-#include "base/logging.h"
-#include "base/spinlock.h"
+#include "stacktrace.h"
+#include "logging.h"
+#include "spinlock.h"
 
 // Sometimes, we can try to get a stack trace from within a stack
 // trace, because libunwind can call mmap (maybe indirectly via an

Modified: branches/tcmalloc-1.4/source/platform/tcmalloc-1.4/stacktrace_powerpc-inl.h
===================================================================
--- branches/tcmalloc-1.4/source/platform/tcmalloc-1.4/stacktrace_powerpc-inl.h	2009-10-14 15:49:40 UTC (rev 3471)
+++ branches/tcmalloc-1.4/source/platform/tcmalloc-1.4/stacktrace_powerpc-inl.h	2009-10-14 15:52:40 UTC (rev 3472)
@@ -38,7 +38,7 @@
 
 #include <stdint.h>   // for uintptr_t
 #include <stdlib.h>   // for NULL
-#include <google/stacktrace.h>
+#include <stacktrace.h>
 
 // Given a pointer to a stack frame, locate and return the calling
 // stackframe, or return NULL if no stackframe can be found. Perform sanity

Modified: branches/tcmalloc-1.4/source/platform/tcmalloc-1.4/stacktrace_win32-inl.h
===================================================================
--- branches/tcmalloc-1.4/source/platform/tcmalloc-1.4/stacktrace_win32-inl.h	2009-10-14 15:49:40 UTC (rev 3471)
+++ branches/tcmalloc-1.4/source/platform/tcmalloc-1.4/stacktrace_win32-inl.h	2009-10-14 15:52:40 UTC (rev 3472)
@@ -49,7 +49,7 @@
 // This code is inspired by a patch from David Vitek:
 //   http://code.google.com/p/google-perftools/issues/detail?id=83
 
-#include "config.h"
+#include "tcmalloc-platform.h"
 #include <windows.h>    // for GetProcAddress and GetModuleHandle
 #include <assert.h>
 

Modified: branches/tcmalloc-1.4/source/platform/tcmalloc-1.4/stacktrace_x86_64-inl.h
===================================================================
--- branches/tcmalloc-1.4/source/platform/tcmalloc-1.4/stacktrace_x86_64-inl.h	2009-10-14 15:49:40 UTC (rev 3471)
+++ branches/tcmalloc-1.4/source/platform/tcmalloc-1.4/stacktrace_x86_64-inl.h	2009-10-14 15:52:40 UTC (rev 3472)
@@ -37,7 +37,7 @@
 #include <unwind.h> // ABI defined unwinder
 #include <string.h> // for memset
 }
-#include "google/stacktrace.h"
+#include "stacktrace.h"
 
 typedef struct {
   void **result;

Modified: branches/tcmalloc-1.4/source/platform/tcmalloc-1.4/vdso_support.h
===================================================================
--- branches/tcmalloc-1.4/source/platform/tcmalloc-1.4/vdso_support.h	2009-10-14 15:49:40 UTC (rev 3471)
+++ branches/tcmalloc-1.4/source/platform/tcmalloc-1.4/vdso_support.h	2009-10-14 15:52:40 UTC (rev 3472)
@@ -39,7 +39,7 @@
 
 #include <stdlib.h>     // for NULL
 #include <link.h>  // for ElfW
-#include "base/basictypes.h"
+#include "basictypes.h"
 
 namespace base {