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

Unified Diff: third_party/apple_apsl/README.chromium

Issue 7550042: Merge trunk r93436 to the 13.0.782 branch to eliminate unhelpful log spew (Closed) Base URL: svn://svn.chromium.org/chrome/branches/782/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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « third_party/apple_apsl/CFBase.h ('k') | third_party/apple_apsl/malloc.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/apple_apsl/README.chromium
===================================================================
--- third_party/apple_apsl/README.chromium (revision 95641)
+++ third_party/apple_apsl/README.chromium (working copy)
@@ -6,16 +6,15 @@
Four files are excerpted here:
malloc.h from:
-http://www.opensource.apple.com/source/Libc/Libc-583/include/malloc/malloc.h
+http://www.opensource.apple.com/source/Libc/Libc-763.11/include/malloc/malloc.h
Modifications:
- Modified #ifdef guards.
- Removed everything but the definition of malloc_zone_t.
- Renamed _malloc_zone_t to ChromeMallocZone to avoid possible name conflicts.
-- Added a few comments.
CFRuntime.h from:
-http://www.opensource.apple.com/source/CF/CF-550/CFRuntime.h
+http://www.opensource.apple.com/source/CF/CF-635/CFRuntime.h
Modifications:
- Modified #ifdef guards.
@@ -23,7 +22,8 @@
- Renamed CFRuntimeBase to ChromeCFRuntimeBase to avoid possible name conflicts.
CFBase.h from:
-http://opensource.apple.com/source/CF/CF-550/CFBase.c
+http://www.opensource.apple.com/source/CF/CF-550/CFBase.c
+http://www.opensource.apple.com/source/CF/CF-635/CFBase.c
Modifications:
- Renamed the file to CFBase.h.
@@ -31,9 +31,8 @@
- 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
- conflicts.
-- Added a presumed definition of ChromeCFAllocator11.
+- Renamed __CFAllocator to ChromeCFAllocator9and10 (from CF-550) and to
+ ChromeCFAllocator11 (from CF-635) to avoid possible name conflicts.
cssmapplePriv.h from:
http://www.opensource.apple.com/source/libsecurity_cssm/libsecurity_cssm-31536/lib/cssmapplePriv.h
« no previous file with comments | « third_party/apple_apsl/CFBase.h ('k') | third_party/apple_apsl/malloc.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698