diff options
| author | glider@chromium.org <glider@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-17 07:59:58 +0000 |
|---|---|---|
| committer | glider@chromium.org <glider@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-17 07:59:58 +0000 |
| commit | b6081702c2cb8094e45c3a58ea92915d4b972ddf (patch) | |
| tree | c2229158e90a3342b986dfa1562a4607b7a57c9f /third_party/tcmalloc/chromium/src/config.h.in | |
| parent | ad26ef4a0c0a170f4a167eea95aed749b791cc95 (diff) | |
| download | chromium_src-b6081702c2cb8094e45c3a58ea92915d4b972ddf.zip chromium_src-b6081702c2cb8094e45c3a58ea92915d4b972ddf.tar.gz chromium_src-b6081702c2cb8094e45c3a58ea92915d4b972ddf.tar.bz2 | |
Merge google-perftools r109 (the current contents of third_party/tcmalloc/vendor)
with the forked Chromium version of tcmalloc.
This change also requires some fixes to base/allocator/allocator.gyp: new tcmalloc
source files added, unittest_utils.cc disabled (tcmalloc has its own snprintf()
implementation now)
Review URL: http://codereview.chromium.org/7050034
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@89452 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party/tcmalloc/chromium/src/config.h.in')
| -rw-r--r-- | third_party/tcmalloc/chromium/src/config.h.in | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/third_party/tcmalloc/chromium/src/config.h.in b/third_party/tcmalloc/chromium/src/config.h.in index 49bbf0d..5ba784e 100644 --- a/third_party/tcmalloc/chromium/src/config.h.in +++ b/third_party/tcmalloc/chromium/src/config.h.in @@ -1,5 +1,10 @@ /* src/config.h.in. Generated from configure.ac by autoheader. */ + +#ifndef GOOGLE_PERFTOOLS_CONFIG_H_ +#define GOOGLE_PERFTOOLS_CONFIG_H_ + + /* Define to 1 if compiler supports __builtin_stack_pointer */ #undef HAVE_BUILTIN_STACK_POINTER @@ -72,6 +77,9 @@ /* Define to 1 if you have the <malloc.h> header file. */ #undef HAVE_MALLOC_H +/* Define to 1 if you have the <malloc/malloc.h> header file. */ +#undef HAVE_MALLOC_MALLOC_H + /* Define to 1 if you have the <memory.h> header file. */ #undef HAVE_MEMORY_H @@ -114,6 +122,15 @@ /* Define to 1 if the system has the type `struct mallinfo'. */ #undef HAVE_STRUCT_MALLINFO +/* Define to 1 if you have the <sys/cdefs.h> header file. */ +#undef HAVE_SYS_CDEFS_H + +/* Define to 1 if you have the <sys/malloc.h> header file. */ +#undef HAVE_SYS_MALLOC_H + +/* Define to 1 if you have the <sys/param.h> header file. */ +#undef HAVE_SYS_PARAM_H + /* Define to 1 if you have the <sys/prctl.h> header file. */ #undef HAVE_SYS_PRCTL_H @@ -129,6 +146,9 @@ /* Define to 1 if you have the <sys/syscall.h> header file. */ #undef HAVE_SYS_SYSCALL_H +/* Define to 1 if you have the <sys/time.h> header file. */ +#undef HAVE_SYS_TIME_H + /* Define to 1 if you have the <sys/types.h> header file. */ #undef HAVE_SYS_TYPES_H @@ -168,6 +188,10 @@ /* Define to 1 if int32_t is equivalent to intptr_t */ #undef INT32_EQUALS_INTPTR +/* Define to the sub-directory in which libtool stores uninstalled libraries. + */ +#undef LT_OBJDIR + /* Define to 1 if your C compiler doesn't accept -c and -o together. */ #undef NO_MINUS_C_MINUS_O @@ -240,3 +264,4 @@ #include "windows/mingw.h" #endif +#endif /* #ifndef GOOGLE_PERFTOOLS_CONFIG_H_ */ |