| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #ifndef THIRD_PARTY_LIBJINGLE_OVERRIDES_ALLOCATOR_SHIM_ALLOCATOR_STUB_H_ | 5 #ifndef THIRD_PARTY_LIBJINGLE_OVERRIDES_ALLOCATOR_SHIM_ALLOCATOR_STUB_H_ |
| 6 #define THIRD_PARTY_LIBJINGLE_OVERRIDES_ALLOCATOR_SHIM_ALLOCATOR_STUB_H_ | 6 #define THIRD_PARTY_LIBJINGLE_OVERRIDES_ALLOCATOR_SHIM_ALLOCATOR_STUB_H_ |
| 7 | 7 |
| 8 #include <new> | 8 #include <new> |
| 9 | 9 |
| 10 #include "base/basictypes.h" | 10 #include "base/basictypes.h" |
| 11 | 11 |
| 12 #if !defined(OS_MACOSX) | 12 #if !defined(OS_MACOSX) && !defined(OS_ANDROID) |
| 13 | 13 |
| 14 typedef void* (*AllocateFunction)(std::size_t); | 14 typedef void* (*AllocateFunction)(std::size_t); |
| 15 typedef void (*DellocateFunction)(void*); | 15 typedef void (*DellocateFunction)(void*); |
| 16 | 16 |
| 17 // The stub implementations that forward new / delete calls to the allocator | 17 // The stub implementations that forward new / delete calls to the allocator |
| 18 // in the current binary (i.e. tcmalloc). | 18 // in the current binary (i.e. tcmalloc). |
| 19 void* Allocate(std::size_t n); | 19 void* Allocate(std::size_t n); |
| 20 void Dellocate(void* p); | 20 void Dellocate(void* p); |
| 21 | 21 |
| 22 #endif // OS_MACOSX | 22 #endif // OS_MACOSX && OS_ANDROID |
| 23 | 23 |
| 24 #endif // THIRD_PARTY_LIBJINGLE_OVERRIDES_ALLOCATOR_SHIM_ALLOCATOR_STUB_H_ | 24 #endif // THIRD_PARTY_LIBJINGLE_OVERRIDES_ALLOCATOR_SHIM_ALLOCATOR_STUB_H_ |
| OLD | NEW |