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

Side by Side Diff: third_party/tcmalloc/chromium/src/base/elf_mem_image.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) 2008, Google Inc. 1 // Copyright (c) 2008, 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 114 matching lines...) Expand 10 before | Expand all | Expand 10 after
125 size_t strsize_; 125 size_t strsize_;
126 size_t verdefnum_; 126 size_t verdefnum_;
127 ElfW(Addr) link_base_; // Link-time base (p_vaddr of first PT_LOAD). 127 ElfW(Addr) link_base_; // Link-time base (p_vaddr of first PT_LOAD).
128 }; 128 };
129 129
130 } // namespace base 130 } // namespace base
131 131
132 #endif // __ELF__ and __GLIBC__ and !__native_client__ 132 #endif // __ELF__ and __GLIBC__ and !__native_client__
133 133
134 #endif // BASE_ELF_MEM_IMAGE_H_ 134 #endif // BASE_ELF_MEM_IMAGE_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698