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

Side by Side Diff: third_party/tcmalloc/vendor/src/gperftools/malloc_hook.h

Issue 9316021: Update the tcmalloc vendor branch to r144 (gperftools 2.0). (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Reuploading Created 8 years, 9 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) 2005, Google Inc. 1 // Copyright (c) 2005, 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 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
62 // 62 //
63 // NOTE FOR C USERS: If you want to use malloc_hook functionality from 63 // NOTE FOR C USERS: If you want to use malloc_hook functionality from
64 // a C program, #include malloc_hook_c.h instead of this file. 64 // a C program, #include malloc_hook_c.h instead of this file.
65 65
66 #ifndef _MALLOC_HOOK_H_ 66 #ifndef _MALLOC_HOOK_H_
67 #define _MALLOC_HOOK_H_ 67 #define _MALLOC_HOOK_H_
68 68
69 #include <stddef.h> 69 #include <stddef.h>
70 #include <sys/types.h> 70 #include <sys/types.h>
71 extern "C" { 71 extern "C" {
72 #include <google/malloc_hook_c.h> // a C version of the malloc_hook interface 72 #include <gperftools/malloc_hook_c.h> // a C version of the malloc_hook interfa ce
73 } 73 }
74 74
75 // Annoying stuff for windows -- makes sure clients can import these functions 75 // Annoying stuff for windows -- makes sure clients can import these functions
76 #ifndef PERFTOOLS_DLL_DECL 76 #ifndef PERFTOOLS_DLL_DECL
77 # ifdef _WIN32 77 # ifdef _WIN32
78 # define PERFTOOLS_DLL_DECL __declspec(dllimport) 78 # define PERFTOOLS_DLL_DECL __declspec(dllimport)
79 # else 79 # else
80 # define PERFTOOLS_DLL_DECL 80 # define PERFTOOLS_DLL_DECL
81 # endif 81 # endif
82 #endif 82 #endif
(...skipping 266 matching lines...) Expand 10 before | Expand all | Expand 10 after
349 static void InvokePreSbrkHookSlow(ptrdiff_t increment); 349 static void InvokePreSbrkHookSlow(ptrdiff_t increment);
350 static void InvokeSbrkHookSlow(const void* result, ptrdiff_t increment); 350 static void InvokeSbrkHookSlow(const void* result, ptrdiff_t increment);
351 }; 351 };
352 352
353 #ifdef _MSC_VER 353 #ifdef _MSC_VER
354 #pragma warning(pop) 354 #pragma warning(pop)
355 #endif 355 #endif
356 356
357 357
358 #endif /* _MALLOC_HOOK_H_ */ 358 #endif /* _MALLOC_HOOK_H_ */
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698