Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(68)

Side by Side Diff: third_party/tcmalloc/chromium/src/gperftools/tcmalloc.h

Issue 10818025: tcmalloc: move includes for mallinfo from tcmalloc.cc to tcmalloc.h (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix tcmalloc instead Created 8 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | third_party/tcmalloc/chromium/src/tcmalloc.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* Copyright (c) 2003, Google Inc. 1 /* Copyright (c) 2003, Google Inc.
2 * All rights reserved. 2 * All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
46 #ifndef __THROW /* I guess we're not on a glibc system */ 46 #ifndef __THROW /* I guess we're not on a glibc system */
47 # define __THROW /* __THROW is just an optimization, so ok to make it "" */ 47 # define __THROW /* __THROW is just an optimization, so ok to make it "" */
48 #endif 48 #endif
49 49
50 // Define the version number so folks can check against it 50 // Define the version number so folks can check against it
51 #define TC_VERSION_MAJOR 2 51 #define TC_VERSION_MAJOR 2
52 #define TC_VERSION_MINOR 0 52 #define TC_VERSION_MINOR 0
53 #define TC_VERSION_PATCH "" 53 #define TC_VERSION_PATCH ""
54 #define TC_VERSION_STRING "gperftools 2.0" 54 #define TC_VERSION_STRING "gperftools 2.0"
55 55
56 #include <stdlib.h> // for struct mallinfo, if it's defined 56 // For struct mallinfo, it it's defined.
57 #ifdef HAVE_STRUCT_MALLINFO
Nico 2012/07/24 16:37:10 HAVE_STRUCT_MALLINFO etc are defined in third_part
58 // Malloc can be in several places on older versions of OS X.
59 # if defined(HAVE_MALLOC_H)
60 # include <malloc.h>
61 # elif defined(HAVE_SYS_MALLOC_H)
62 # include <sys/malloc.h>
63 # elif defined(HAVE_MALLOC_MALLOC_H)
64 # include <malloc/malloc.h>
65 # endif
66 #endif
57 67
58 // Annoying stuff for windows -- makes sure clients can import these functions 68 // Annoying stuff for windows -- makes sure clients can import these functions
59 #ifndef PERFTOOLS_DLL_DECL 69 #ifndef PERFTOOLS_DLL_DECL
60 # ifdef _WIN32 70 # ifdef _WIN32
61 # define PERFTOOLS_DLL_DECL __declspec(dllimport) 71 # define PERFTOOLS_DLL_DECL __declspec(dllimport)
62 # else 72 # else
63 # define PERFTOOLS_DLL_DECL 73 # define PERFTOOLS_DLL_DECL
64 # endif 74 # endif
65 #endif 75 #endif
66 76
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
114 PERFTOOLS_DLL_DECL void* tc_newarray(size_t size); 124 PERFTOOLS_DLL_DECL void* tc_newarray(size_t size);
115 PERFTOOLS_DLL_DECL void* tc_newarray_nothrow(size_t size, 125 PERFTOOLS_DLL_DECL void* tc_newarray_nothrow(size_t size,
116 const std::nothrow_t&) __THROW; 126 const std::nothrow_t&) __THROW;
117 PERFTOOLS_DLL_DECL void tc_deletearray(void* p) __THROW; 127 PERFTOOLS_DLL_DECL void tc_deletearray(void* p) __THROW;
118 PERFTOOLS_DLL_DECL void tc_deletearray_nothrow(void* p, 128 PERFTOOLS_DLL_DECL void tc_deletearray_nothrow(void* p,
119 const std::nothrow_t&) __THROW; 129 const std::nothrow_t&) __THROW;
120 } 130 }
121 #endif 131 #endif
122 132
123 #endif // #ifndef TCMALLOC_TCMALLOC_H_ 133 #endif // #ifndef TCMALLOC_TCMALLOC_H_
OLDNEW
« no previous file with comments | « no previous file | third_party/tcmalloc/chromium/src/tcmalloc.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698