diff options
Diffstat (limited to 'third_party')
| -rw-r--r-- | third_party/apple_apsl/CFBase.h | 4 | ||||
| -rw-r--r-- | third_party/apple_apsl/README.chromium | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/third_party/apple_apsl/CFBase.h b/third_party/apple_apsl/CFBase.h index 4c52e0e..7942966 100644 --- a/third_party/apple_apsl/CFBase.h +++ b/third_party/apple_apsl/CFBase.h @@ -30,7 +30,7 @@ #include "CFRuntime.h" -struct ChromeCFAllocator9and10 { +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 */ @@ -51,7 +51,7 @@ struct ChromeCFAllocator9and10 { }; // TODO(avi): update upon source release; http://crbug.com/74589 -struct ChromeCFAllocator11 { +struct ChromeCFAllocatorLion { ChromeCFRuntimeBase _base; // CFAllocator in Darwin 9 included a complete copy of _malloc_zone_t. The // version in Darwin 10 had an abbreviated _malloc_zone_t that ended after the diff --git a/third_party/apple_apsl/README.chromium b/third_party/apple_apsl/README.chromium index f183768..2f014a2 100644 --- a/third_party/apple_apsl/README.chromium +++ b/third_party/apple_apsl/README.chromium @@ -31,9 +31,9 @@ Modifications: - Added an #include of the CFRuntime.h file. - Removed everything but the definition of __CFAllocator. - Modified the reference of CFRuntimeBase to ChromeCFRuntimeBase. -- Renamed __CFAllocator to ChromeCFAllocator9and10 to avoid possible name +- Renamed __CFAllocator to ChromeCFAllocatorLeopards to avoid possible name conflicts. -- Added a presumed definition of ChromeCFAllocator11. +- Added a presumed definition of ChromeCFAllocatorLion. cssmapplePriv.h from: http://www.opensource.apple.com/source/libsecurity_cssm/libsecurity_cssm-31536/lib/cssmapplePriv.h |