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

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

Issue 7430007: Merge tcmalloc r111 (perftools v. 1.8) with the chromium/ branch. Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 years, 4 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
OLDNEW
1 // Copyright (c) 2011, Google Inc. 1 // Copyright (c) 2011, 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 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
84 #endif 84 #endif
85 size_t malloc_size(void* p) __THROW { return tc_malloc_size(p); } 85 size_t malloc_size(void* p) __THROW { return tc_malloc_size(p); }
86 size_t malloc_usable_size(void* p) __THROW { return tc_malloc_size(p); } 86 size_t malloc_usable_size(void* p) __THROW { return tc_malloc_size(p); }
87 } // extern "C" 87 } // extern "C"
88 88
89 // No need to do anything at tcmalloc-registration time: we do it all 89 // No need to do anything at tcmalloc-registration time: we do it all
90 // via overriding weak symbols (at link time). 90 // via overriding weak symbols (at link time).
91 static void ReplaceSystemAlloc() { } 91 static void ReplaceSystemAlloc() { }
92 92
93 #endif // TCMALLOC_LIBC_OVERRIDE_REDEFINE_H_ 93 #endif // TCMALLOC_LIBC_OVERRIDE_REDEFINE_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698