| Index: third_party/apple_apsl/CFBase.h
|
| diff --git a/third_party/apple_apsl/CFBase.h b/third_party/apple_apsl/CFBase.h
|
| index d74360afcda7fde57820e59d6f3eefa076048687..b3fbd179acfb548b1e19ab7f7caaa0bcf9272d10 100644
|
| --- a/third_party/apple_apsl/CFBase.h
|
| +++ b/third_party/apple_apsl/CFBase.h
|
| @@ -30,26 +30,6 @@
|
|
|
| #include "CFRuntime.h"
|
|
|
| -struct ChromeCFAllocatorLeopards {
|
| - ChromeCFRuntimeBase _base;
|
| -#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED
|
| - size_t (*size)(struct _malloc_zone_t *zone, const void *ptr); /* returns the size of a block or 0 if not in this zone; must be fast, especially for negative answers */
|
| - void *(*malloc)(struct _malloc_zone_t *zone, size_t size);
|
| - void *(*calloc)(struct _malloc_zone_t *zone, size_t num_items, size_t size); /* same as malloc, but block returned is set to zero */
|
| - void *(*valloc)(struct _malloc_zone_t *zone, size_t size); /* same as malloc, but block returned is set to zero and is guaranteed to be page aligned */
|
| - void (*free)(struct _malloc_zone_t *zone, void *ptr);
|
| - void *(*realloc)(struct _malloc_zone_t *zone, void *ptr, size_t size);
|
| - void (*destroy)(struct _malloc_zone_t *zone); /* zone is destroyed and all memory reclaimed */
|
| - const char *zone_name;
|
| - unsigned (*batch_malloc)(struct _malloc_zone_t *zone, size_t size, void **results, unsigned num_requested); /* given a size, returns pointers capable of holding that size; returns the number of pointers allocated (maybe 0 or less than num_requested) */
|
| - void (*batch_free)(struct _malloc_zone_t *zone, void **to_be_freed, unsigned num_to_be_freed); /* frees all the pointers in to_be_freed; note that to_be_freed may be overwritten during the process */
|
| - struct malloc_introspection_t *introspect;
|
| - void *reserved5;
|
| -#endif
|
| - CFAllocatorRef _allocator;
|
| - CFAllocatorContext _context;
|
| -};
|
| -
|
| struct ChromeCFAllocatorLions {
|
| ChromeCFRuntimeBase _base;
|
| #if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED
|
|
|