CF-550.13.tar.gz

diff --git a/BuildCFLite b/BuildCFLite
index c368273ac1f3be754d520077136ced5a193fdc00..7bc3eea815afd2773d9c889b9fcb4a2c8e047c8e 100755 (executable)
--- a/BuildCFLite
+++ b/BuildCFLite
@@ -26,8 +26,8 @@ PRIVATE_HEADERS="CFBundlePriv.h CFCharacterSetPriv.h CFError_Private.h CFLogUtil
 
 OBJBASE=./CF-Objects
 ARCHFLAGS="-arch i386 -arch x86_64"
-CFLAGS="-c -x objective-c -pipe -std=gnu99 -g -Wmost -Wno-trigraphs -mmacosx-version-min=10.6 -fconstant-cfstrings -fexceptions -DCF_BUILDING_CF=1 -DDEPLOYMENT_TARGET_MACOSX=1 -DMAC_OS_X_VERSION_MAX_ALLOWED=MAC_OS_X_VERSION_10_6 -DU_SHOW_DRAFT_API=1 -I$OBJBASE -DVERSION=535 -include CoreFoundation_Prefix.h"
-LFLAGS="-dynamiclib -mmacosx-version-min=10.6 -twolevel_namespace -init ___CFInitialize -compatibility_version 150 -current_version 535 -sectcreate __UNICODE __csbitmaps CFCharacterSetBitmaps.bitmap -Wl,-alias_list,SymbolAliases -sectcreate __UNICODE __properties CFUniCharPropertyDatabase.data -sectcreate __UNICODE __data $UNICODE_DATA_FILE -segprot __UNICODE r r"
+CFLAGS="-c -x objective-c -pipe -std=gnu99 -g -Wmost -Wno-trigraphs -mmacosx-version-min=10.6 -fconstant-cfstrings -fexceptions -DCF_BUILDING_CF=1 -DDEPLOYMENT_TARGET_MACOSX=1 -DMAC_OS_X_VERSION_MAX_ALLOWED=MAC_OS_X_VERSION_10_6 -DU_SHOW_DRAFT_API=1 -I$OBJBASE -DVERSION=550.13 -include CoreFoundation_Prefix.h"
+LFLAGS="-dynamiclib -mmacosx-version-min=10.6 -twolevel_namespace -init ___CFInitialize -compatibility_version 150 -current_version 550.13 -sectcreate __UNICODE __csbitmaps CFCharacterSetBitmaps.bitmap -Wl,-alias_list,SymbolAliases -sectcreate __UNICODE __properties CFUniCharPropertyDatabase.data -sectcreate __UNICODE __data $UNICODE_DATA_FILE -segprot __UNICODE r r"
 
 /bin/rm -rf $OBJBASE
 /bin/mkdir -p $OBJBASE

diff --git a/CFApplicationPreferences.c b/CFApplicationPreferences.c
index 7133c231cf26809afaceb3035ab4b667f778acfd..985e7e4ea0b9409f9ba1f0df4973675564f3ddb9 100644 (file)
--- a/CFApplicationPreferences.c
+++ b/CFApplicationPreferences.c
@@ -20,6 +20,7 @@
  * 
  * @APPLE_LICENSE_HEADER_END@
  */
+
 /*     CFApplicationPreferences.c
        Copyright (c) 1998-2009, Apple Inc. All rights reserved.
        Responsibility: Chris Parker

diff --git a/CFArray.c b/CFArray.c
index bbb2ad3cfb7aaa2258a2ab6f65976fe1cf6e1fdf..f09f90c389ac916ea6c00a06172a3562cf5ca465 100644 (file)
--- a/CFArray.c
+++ b/CFArray.c
@@ -20,6 +20,7 @@
  * 
  * @APPLE_LICENSE_HEADER_END@
  */
+
 /*     CFArray.c
        Copyright (c) 1998-2009, Apple Inc. All rights reserved.
        Responsibility: Christopher Kane

diff --git a/CFArray.h b/CFArray.h
index 7118d04ce12a85cbebb80f6181fcaee53c9b2190..96281d1a7b472f2ed05bb3186069c0ef15fad156 100644 (file)
--- a/CFArray.h
+++ b/CFArray.h
@@ -20,6 +20,7 @@
  * 
  * @APPLE_LICENSE_HEADER_END@
  */
+
 /*     CFArray.h
        Copyright (c) 1998-2009, Apple Inc. All rights reserved.
 */

diff --git a/CFBag.c b/CFBag.c
index 4c4019eca69af36939f16c76bab2de6dc8d07385..d7088441697ea507cb94c9bd6c981487aa7d94e3 100644 (file)
--- a/CFBag.c
+++ b/CFBag.c
@@ -20,6 +20,7 @@
  * 
  * @APPLE_LICENSE_HEADER_END@
  */
+
 /*     CFBag.c
        Copyright 1998-2008, Apple, Inc. All rights reserved.
        Responsibility: Christopher Kane

diff --git a/CFBag.h b/CFBag.h
index 54cfeb18135efe4a8ab0f6333a1b49bac7414aaf..21460ca4dd9f26ab01cba6e768eb1d8d2f3ca716 100644 (file)
--- a/CFBag.h
+++ b/CFBag.h
@@ -20,6 +20,7 @@
  * 
  * @APPLE_LICENSE_HEADER_END@
  */
+
 /*     CFBag.h
        Copyright (c) 1998-2009, Apple Inc. All rights reserved.
 */

diff --git a/CFBase.c b/CFBase.c
index 068826a739552de07570753a1bfa9d4e0c7fdb37..daeb79025ecb9eef59c97a7e2ddedbf9307ce40c 100644 (file)
--- a/CFBase.c
+++ b/CFBase.c
@@ -20,6 +20,7 @@
  * 
  * @APPLE_LICENSE_HEADER_END@
  */
+
 /*     CFBase.c
        Copyright (c) 1998-2009, Apple Inc. All rights reserved.
        Responsibility: Christopher Kane
@@ -424,7 +425,7 @@ static const CFRuntimeClass __CFAllocatorClass = {
     "CFAllocator",
     NULL,      // init
     NULL,      // copy
-    __CFAllocatorDeallocate,
+    NULL,
     NULL,      // equal
     NULL,      // hash
     NULL,      // 

diff --git a/CFBase.h b/CFBase.h
index c21f1e7f86ba8ae6b136e0ea5ae88c03b4db11e8..9cb933c62fc0449e111a315f6c6f967d56bc3b9d 100644 (file)
--- a/CFBase.h
+++ b/CFBase.h
@@ -20,6 +20,7 @@
  * 
  * @APPLE_LICENSE_HEADER_END@
  */
+
 /*     CFBase.h
        Copyright (c) 1998-2009, Apple Inc. All rights reserved.
 */

diff --git a/CFBasicHash.h b/CFBasicHash.h
index e592b6949227651acc1b590cbaef469c5788825c..856a2cfcef8da1ecfd27414899104edb8510710e 100644 (file)
--- a/CFBasicHash.h
+++ b/CFBasicHash.h
@@ -20,6 +20,7 @@
  * 
  * @APPLE_LICENSE_HEADER_END@
  */
+
 /*     CFBasicHash.h
        Copyright (c) 2008-2009, Apple Inc. All rights reserved.
 */

diff --git a/CFBasicHash.m b/CFBasicHash.m
index 929d8bf7d197deb2fe9bd0db6378fb8b0cfcab03..b101220c75a6d2a619a0472e03562afd5ce92b87 100644 (file)
--- a/CFBasicHash.m
+++ b/CFBasicHash.m
@@ -20,6 +20,7 @@
  * 
  * @APPLE_LICENSE_HEADER_END@
  */
+
 /*     CFBasicHash.m
        Copyright (c) 2008-2009, Apple Inc. All rights reserved.
        Responsibility: Christopher Kane

diff --git a/CFBinaryHeap.c b/CFBinaryHeap.c
index bd16c75901adb58bc959781b94ca59461946a181..f7ad579729554f7963b8301e5a4df7fc0f7f3138 100644 (file)
--- a/CFBinaryHeap.c
+++ b/CFBinaryHeap.c
@@ -20,6 +20,7 @@
  * 
  * @APPLE_LICENSE_HEADER_END@
  */
+
 /*     CFBinaryHeap.c
        Copyright (c) 1998-2009, Apple Inc. All rights reserved.
        Responsibility: Christopher Kane

diff --git a/CFBinaryHeap.h b/CFBinaryHeap.h
index 9195dede6a5ce1b2562af3b167b42da8df784654..d71a83969f195f4948d553874221b9fadc199026 100644 (file)
--- a/CFBinaryHeap.h
+++ b/CFBinaryHeap.h
@@ -20,6 +20,7 @@
  * 
  * @APPLE_LICENSE_HEADER_END@
  */
+
 /*     CFBinaryHeap.h
        Copyright (c) 1998-2009, Apple Inc. All rights reserved.
 */

diff --git a/CFBinaryPList.c b/CFBinaryPList.c
index a07d155c9e1069c681ac02a7d9812c3ba64e98ee..9a29a14726230ef6ea1eeb0888ee44cff6642bd4 100644 (file)
--- a/CFBinaryPList.c
+++ b/CFBinaryPList.c
@@ -20,6 +20,7 @@
  * 
  * @APPLE_LICENSE_HEADER_END@
  */
+
 /*     CFBinaryPList.c
        Copyright (c) 2000-2009, Apple Inc. All rights reserved.
        Responsibility: Tony Parker

diff --git a/CFBitVector.c b/CFBitVector.c
index 1ff33e460aa2c0bcf7e654d515c1a41beb88e971..4a11fba9c60cc0ac21903ecfa3a56c87038ec77e 100644 (file)
--- a/CFBitVector.c
+++ b/CFBitVector.c
@@ -20,6 +20,7 @@
  * 
  * @APPLE_LICENSE_HEADER_END@
  */
+
 /*     CFBitVector.c
        Copyright (c) 1998-2009, Apple Inc. All rights reserved.
        Responsibility: Christopher Kane

diff --git a/CFBitVector.h b/CFBitVector.h
index ad9defc10a508f7d402c7f2177be772df8519449..2802cf08cb3eba7edf5facbe44217fdb6bdb00f8 100644 (file)
--- a/CFBitVector.h
+++ b/CFBitVector.h
@@ -20,6 +20,7 @@
  * 
  * @APPLE_LICENSE_HEADER_END@
  */
+
 /*     CFBitVector.h
        Copyright (c) 1998-2009, Apple Inc. All rights reserved.
 */

diff --git a/CFBuiltinConverters.c b/CFBuiltinConverters.c
index af6fb88d2131f0e33431dced4ba09f6a3f69cb84..f60f727eeaf71bac9bd91a3498ae84e72fcbc4e6 100644 (file)
--- a/CFBuiltinConverters.c
+++ b/CFBuiltinConverters.c
@@ -20,6 +20,7 @@
  * 
  * @APPLE_LICENSE_HEADER_END@
  */
+
 /*     CFBuiltinConverters.c
        Copyright (c) 1999-2009, Apple Inc. All rights reserved.
        Responsibility: Aki Inoue

diff --git a/CFBundle.c b/CFBundle.c
index 2560072970db2cc55ff4e0f07154ec0837f4416a..6921cbd418675e1ffdaf6d47576805150949bdb8 100644 (file)
--- a/CFBundle.c
+++ b/CFBundle.c
@@ -20,6 +20,7 @@
  * 
  * @APPLE_LICENSE_HEADER_END@
  */
+
 /*      CFBundle.c
         Copyright (c) 1999-2009, Apple Inc.  All rights reserved.
         Responsibility: Doug Davidson

diff --git a/CFBundle.h b/CFBundle.h
index c8347392df50f13d08812d38394c7eaa5f8035dc..592c0662981b49a9a13b6165b26732938a907402 100644 (file)
--- a/CFBundle.h
+++ b/CFBundle.h
@@ -20,6 +20,7 @@
  * 
  * @APPLE_LICENSE_HEADER_END@
  */
+
 /*     CFBundle.h
        Copyright (c) 1999-2009, Apple Inc.  All rights reserved.
 */

diff --git a/CFBundlePriv.h b/CFBundlePriv.h
index 7f076b2721315dc6141bcfabf41caecae83b35be..7d427e97e8bd36e1edfc641b091415e7aac538c5 100644 (file)
--- a/CFBundlePriv.h
+++ b/CFBundlePriv.h
@@ -20,6 +20,7 @@
  * 
  * @APPLE_LICENSE_HEADER_END@
  */
+
 /*     CFBundlePriv.h
        Copyright (c) 1999-2009, Apple Inc.  All rights reserved.
 */

diff --git a/CFBundle_BinaryTypes.h b/CFBundle_BinaryTypes.h
index 54db8158e8b7ff33851eb4810e315ac4c9226a08..a0fa7fc3a7d10f340ab930cffa0bc4a70ffefd85 100644 (file)
--- a/CFBundle_BinaryTypes.h
+++ b/CFBundle_BinaryTypes.h
@@ -20,6 +20,7 @@
  * 
  * @APPLE_LICENSE_HEADER_END@
  */
+
 /*     CFBundle_BinaryTypes.h
        Copyright (c) 1999-2009, Apple Inc.  All rights reserved.
 */

diff --git a/CFBundle_Internal.h b/CFBundle_Internal.h
index 668ed6108e41fc14e4129c75d4865389135153cb..472c52925f19b5b6cca7f1cf284088e22e7ced9d 100644 (file)
--- a/CFBundle_Internal.h
+++ b/CFBundle_Internal.h
@@ -20,6 +20,7 @@
  * 
  * @APPLE_LICENSE_HEADER_END@
  */
+
 /*     CFBundle_Internal.h
        Copyright (c) 1999-2009, Apple Inc.  All rights reserved.
 */

diff --git a/CFBundle_Resources.c b/CFBundle_Resources.c
index ef084a6276d160d6ec421ef3c9cd95929693ca09..c4b7675b669286a3f1c15a7cb066b0acd4fc6776 100644 (file)
--- a/CFBundle_Resources.c
+++ b/CFBundle_Resources.c
@@ -20,6 +20,7 @@
  * 
  * @APPLE_LICENSE_HEADER_END@
  */
+
 /*      CFBundle_Resources.c
         Copyright (c) 1999-2009, Apple Inc.  All rights reserved.
         Responsibility: Doug Davidson

diff --git a/CFByteOrder.h b/CFByteOrder.h
index 89045b319b91ff35b688de790a9880eb9d3be249..e8f088a13c5d9daff5947309e049df8560a796c4 100644 (file)
--- a/CFByteOrder.h
+++ b/CFByteOrder.h
@@ -20,6 +20,7 @@
  * 
  * @APPLE_LICENSE_HEADER_END@
  */
+
 /*     CFByteOrder.h
        Copyright (c) 1995-2009, Apple Inc. All rights reserved.
 */

diff --git a/CFCalendar.c b/CFCalendar.c
index 33b58b6e8c8555b0d33e90a841630e7a0ade1863..6d3e8d47e0fb6a55066f9a13fd55745a5070dc6c 100644 (file)
--- a/CFCalendar.c
+++ b/CFCalendar.c
@@ -20,6 +20,7 @@
  * 
  * @APPLE_LICENSE_HEADER_END@
  */
+
 /*     CFCalendar.c
        Copyright 2004-2004, Apple Computer, Inc. All rights reserved.
        Responsibility: Christopher Kane

diff --git a/CFCalendar.h b/CFCalendar.h
index c6179fb28f4f8e636e561319f276d3680aa611bb..6fe4b8927dd7fcc2c5b4d3cba44e6e4e0ad8fa39 100644 (file)
--- a/CFCalendar.h
+++ b/CFCalendar.h
@@ -20,6 +20,7 @@
  * 
  * @APPLE_LICENSE_HEADER_END@
  */
+
 /*     CFCalendar.h
        Copyright (c) 2004-2009, Apple Inc. All rights reserved.
 */

diff --git a/CFCharacterSet.c b/CFCharacterSet.c
index 0daf28af64af35dfa3c4cef1a626df281def6a01..cc8598d9757a2fcf03cd8168918db4da8e1a558e 100644 (file)
--- a/CFCharacterSet.c
+++ b/CFCharacterSet.c
@@ -20,6 +20,7 @@
  * 
  * @APPLE_LICENSE_HEADER_END@
  */
+
 /*     CFCharacterSet.c
        Copyright (c) 1999-2009, Apple Inc. All rights reserved.
        Responsibility: Aki Inoue

diff --git a/CFCharacterSet.h b/CFCharacterSet.h
index fe4adbe2dd80bb5e6c5325fa47b5a676ae2379c5..af7285dafcdbc74d8e8e86b11f99294501dd2c0c 100644 (file)
--- a/CFCharacterSet.h
+++ b/CFCharacterSet.h
@@ -20,6 +20,7 @@
  * 
  * @APPLE_LICENSE_HEADER_END@
  */
+
 /*     CFCharacterSet.h
        Copyright (c) 1999-2009, Apple Inc. All rights reserved.
 */

diff --git a/CFCharacterSetPriv.h b/CFCharacterSetPriv.h
index ea4a79669f66314447dc6c3f9e502f501404f745..158f423205265e8c8b26dcc5e3080a58c8534ca3 100644 (file)
--- a/CFCharacterSetPriv.h
+++ b/CFCharacterSetPriv.h
@@ -20,6 +20,7 @@
  * 
  * @APPLE_LICENSE_HEADER_END@
  */
+
 /*     CFCharacterSetPriv.h
        Copyright (c) 1998-2009, Apple Inc. All rights reserved.
 */

diff --git a/CFConcreteStreams.c b/CFConcreteStreams.c
index 50a1e4b24ea770e7fe60637214b06bd7bec996c8..abbd5a43b00c0f4c0bd38808ab14a58d384b3ddd 100644 (file)
--- a/CFConcreteStreams.c
+++ b/CFConcreteStreams.c
@@ -20,6 +20,7 @@
  * 
  * @APPLE_LICENSE_HEADER_END@
  */
+
 /*     CFConcreteStreams.c
        Copyright (c) 2000-2009, Apple Inc. All rights reserved.
        Responsibility: Becky Willrich

diff --git a/CFData.c b/CFData.c
index fc370e5c6aa26a5b6351e4770574611753481b44..62db7676e698e7e709296a783324c042043cc2d1 100644 (file)
--- a/CFData.c
+++ b/CFData.c
@@ -20,6 +20,7 @@
  * 
  * @APPLE_LICENSE_HEADER_END@
  */
+
 /*     CFData.c
        Copyright (c) 1998-2009, Apple Inc. All rights reserved.
        Responsibility: Kevin Perry

diff --git a/CFData.h b/CFData.h
index 7176ca8487b0befc7c11194d7d832d4e29c1b112..2d7f1733b58b31a503e799d141f984c9c96d80a1 100644 (file)
--- a/CFData.h
+++ b/CFData.h
@@ -20,6 +20,7 @@
  * 
  * @APPLE_LICENSE_HEADER_END@
  */
+
 /*     CFData.h
        Copyright (c) 1998-2009, Apple Inc. All rights reserved.
 */

diff --git a/CFDate.c b/CFDate.c
index 8c817db2b350e839ce4d7320804ee9a3708f4648..252f4d4932f471c740ae02432e863062ee943578 100644 (file)
--- a/CFDate.c
+++ b/CFDate.c
@@ -20,6 +20,7 @@
  * 
  * @APPLE_LICENSE_HEADER_END@
  */
+
 /*     CFDate.c
        Copyright (c) 1998-2009, Apple Inc. All rights reserved.
        Responsibility: Christopher Kane

diff --git a/CFDate.h b/CFDate.h
index b5c0de2ded5ea730146538176465310a2c3a8b4d..b2df7a91c0023875814b429e2eb20ea57d8e58b5 100644 (file)
--- a/CFDate.h
+++ b/CFDate.h
@@ -20,6 +20,7 @@
  * 
  * @APPLE_LICENSE_HEADER_END@
  */
+
 /*     CFDate.h
        Copyright (c) 1998-2009, Apple Inc. All rights reserved.
 */

diff --git a/CFDateFormatter.c b/CFDateFormatter.c
index f07f66b4ec2784bdcce6dbd8a34bdff999966560..ee6696b97c9f3087d4d3d5bc6198660c71d0c35b 100644 (file)
--- a/CFDateFormatter.c
+++ b/CFDateFormatter.c
@@ -20,6 +20,7 @@
  * 
  * @APPLE_LICENSE_HEADER_END@
  */
+
 /*        CFDateFormatter.c
         Copyright (c) 2002-2009, Apple Inc. All rights reserved.
         Responsibility: Christopher Kane

diff --git a/CFDateFormatter.h b/CFDateFormatter.h
index 4c9d1f7059f0548b3b4acac5f580de5233c48c33..c592255135e57733ad1b610b0b3bae2b82ff31a8 100644 (file)
--- a/CFDateFormatter.h
+++ b/CFDateFormatter.h
@@ -20,6 +20,7 @@
  * 
  * @APPLE_LICENSE_HEADER_END@
  */
+
 /*     CFDateFormatter.h
        Copyright (c) 2003-2009, Apple Inc. All rights reserved.
 */

diff --git a/CFDictionary.c b/CFDictionary.c
index f86b4917d1dc97a1b80eaf58fbf0bb710dc76386..c12ff5057c8d5decd1a909218cd0376316b8c43a 100644 (file)
--- a/CFDictionary.c
+++ b/CFDictionary.c
@@ -20,6 +20,7 @@
  * 
  * @APPLE_LICENSE_HEADER_END@
  */
+
 /*     CFDictionary.c
        Copyright 1998-2008, Apple, Inc. All rights reserved.
        Responsibility: Christopher Kane

diff --git a/CFDictionary.h b/CFDictionary.h
index 26611ac49aea6f56bd3bc87a965d6b82f961bff5..778802f37063ee5ff8adbd33f2783d5cbef97d58 100644 (file)
--- a/CFDictionary.h
+++ b/CFDictionary.h
@@ -20,6 +20,7 @@
  * 
  * @APPLE_LICENSE_HEADER_END@
  */
+
 /*     CFDictionary.h
        Copyright (c) 1998-2009, Apple Inc. All rights reserved.
 */

diff --git a/CFError.c b/CFError.c
index ab8895db6ac45e64893673f20579b02437916f46..3a19acbc2d28d277c552cfde6bcca8c34d13b35c 100644 (file)
--- a/CFError.c
+++ b/CFError.c
@@ -20,6 +20,7 @@
  * 
  * @APPLE_LICENSE_HEADER_END@
  */
+
 /*     CFError.c
        Copyright 2006-2009, Apple Inc. All rights reserved.
        Responsibility: Ali Ozer

diff --git a/CFError.h b/CFError.h
index ca4aa92c6ba6baceb8a1da7cfe17d620c7fc0e30..629e11398c2c53be290b8fbd74c740b23d08eb74 100644 (file)
--- a/CFError.h
+++ b/CFError.h
@@ -20,6 +20,7 @@
  * 
  * @APPLE_LICENSE_HEADER_END@
  */
+
 /*     CFError.h
        Copyright (c) 2006-2009, Apple Inc. All rights reserved.
 */

diff --git a/CFError_Private.h b/CFError_Private.h
index 2f8b75e71e41c45bfee476a52c821c99759d858e..5114d36762bd41f91ebf86e3cb33f2fafe99c581 100644 (file)
--- a/CFError_Private.h
+++ b/CFError_Private.h
@@ -20,6 +20,7 @@
  * 
  * @APPLE_LICENSE_HEADER_END@
  */
+
 /*     CFError_Private.h
         Copyright (c) 2006-2009, Apple Inc. All rights reserved.
        

diff --git a/CFFileUtilities.c b/CFFileUtilities.c
index ea8fce4b85ace6fed23c1e67d506a073f31e6fac..85993d74434fb0bbc9ca721f341435c2d258a681 100644 (file)
--- a/CFFileUtilities.c
+++ b/CFFileUtilities.c
@@ -20,6 +20,7 @@
  * 
  * @APPLE_LICENSE_HEADER_END@
  */
+
 /*     CFFileUtilities.c
        Copyright (c) 1999-2009, Apple Inc. All rights reserved.
        Responsibility: Christopher Kane

diff --git a/CFICUConverters.c b/CFICUConverters.c
index 2698c3be6d18ff4329b17278761836fa2152a8b3..bb192473ea3e7f877c6016313ca240d4f1980f69 100644 (file)
--- a/CFICUConverters.c
+++ b/CFICUConverters.c
@@ -20,6 +20,7 @@
  * 
  * @APPLE_LICENSE_HEADER_END@
  */
+
 /*
  *  CFICUConverters.c
  *  CoreFoundation

diff --git a/CFICUConverters.h b/CFICUConverters.h
index 2798c6c9c92afe311e69de00d44cbc8132cb51bf..b2c72325ef443f5c06b12e36a574b30031f6ef9f 100644 (file)
--- a/CFICUConverters.h
+++ b/CFICUConverters.h
@@ -20,6 +20,7 @@
  * 
  * @APPLE_LICENSE_HEADER_END@
  */
+
 /*
  *  CFICUConverters.h
  *  CoreFoundation

diff --git a/CFInternal.h b/CFInternal.h
index 12505f1cc3fb50ee085a7d5b87150d6f949b3eb0..d85772e33f45430c68d92b03b18583cb3ad2c9f1 100644 (file)
--- a/CFInternal.h
+++ b/CFInternal.h
@@ -20,6 +20,7 @@
  * 
  * @APPLE_LICENSE_HEADER_END@
  */
+
 /*     CFInternal.h
        Copyright (c) 1998-2009, Apple Inc. All rights reserved.
 */
@@ -74,7 +75,6 @@ CF_EXTERN_C_BEGIN
 #define __CF_BIG_ENDIAN__ 0
 #endif
 
-
 #include <CoreFoundation/ForFoundationOnly.h>
 
 CF_EXPORT const char *_CFProcessName(void);
@@ -548,7 +548,7 @@ CF_INLINE Boolean CF_IS_OBJC(CFTypeID typeID, const void *obj) {
     return (typeID >= __CFRuntimeClassTableSize) || (((CFRuntimeBase *)obj)->_cfisa != __CFISAForTypeID(typeID) && ((CFRuntimeBase *)obj)->_cfisa > (uintptr_t)0xFFF);
 }
 
-#endif
+
 #define CF_IS_OBJC(typeID, obj)        (false)
 
 #define CF_OBJC_VOIDCALL0(obj, sel)
@@ -566,6 +566,7 @@ CF_INLINE Boolean CF_IS_OBJC(CFTypeID typeID, const void *obj) {
 #define CF_OBJC_FUNCDISPATCH4(typeID, rettype, obj, sel, a1, a2, a3, a4)
 #define CF_OBJC_FUNCDISPATCH5(typeID, rettype, obj, sel, a1, a2, a3, a4, a5)
 
+#endif
 
 /* See comments in CFBase.c
 */

diff --git a/CFLocale.c b/CFLocale.c
index 0da713278b52b350719ee2d581a1d173d824a490..ba125fabc07985ed739c15f39e86aa51d2d8fdaf 100644 (file)
--- a/CFLocale.c
+++ b/CFLocale.c
@@ -20,6 +20,7 @@
  * 
  * @APPLE_LICENSE_HEADER_END@
  */
+
 /*  CFLocale.c
     Copyright (c) 2002-2009, Apple Inc. All rights reserved.
     Responsibility: Christopher Kane

diff --git a/CFLocale.h b/CFLocale.h
index cc7b5ce3e42c1f6cb3f219f2a3f0dd7fed58dada..28b7dd5a39df7aade6ec73c5248f540c4b848c19 100644 (file)
--- a/CFLocale.h
+++ b/CFLocale.h
@@ -20,6 +20,7 @@
  * 
  * @APPLE_LICENSE_HEADER_END@
  */
+
 /*     CFLocale.h
        Copyright (c) 2002-2009, Apple Inc. All rights reserved.
 */

diff --git a/CFLocaleIdentifier.c b/CFLocaleIdentifier.c
index 1c4d595ed4bfe495951dc2313f6a2b9778967cdf..b8bad79cf12d8a269ec441afb62733b4e4dc9088 100644 (file)
--- a/CFLocaleIdentifier.c
+++ b/CFLocaleIdentifier.c
@@ -20,6 +20,7 @@
  * 
  * @APPLE_LICENSE_HEADER_END@
  */
+
 /*
     CFLocaleIdentifier.c
        Copyright (c) 2002-2009, Apple Inc. All rights reserved.

diff --git a/CFLocaleInternal.h b/CFLocaleInternal.h
index ec9ba429d17c2bfc3be2d383145f73b810594e4c..509d93b41509efd38ca6fcbfa9aa87a4d873e7b9 100644 (file)
--- a/CFLocaleInternal.h
+++ b/CFLocaleInternal.h
@@ -20,6 +20,7 @@
  * 
  * @APPLE_LICENSE_HEADER_END@
  */
+
 /*     
  CFLocaleInternal.h
  Copyright (c) 2008-2009, Apple Inc. All rights reserved.

diff --git a/CFLocaleKeys.m b/CFLocaleKeys.m
index 7d6c8a399e8f6707e27a92fb7accd5f9dae8436b..0873fd6d165c3b8039da1482990ce1bd7538f70a 100644 (file)
--- a/CFLocaleKeys.m
+++ b/CFLocaleKeys.m
@@ -21,6 +21,7 @@
  * @APPLE_LICENSE_HEADER_END@
  */
 
+
 @class NSString;
 
 NSString * const kCFLocaleAlternateQuotationBeginDelimiterKey = @"kCFLocaleAlternateQuotationBeginDelimiterKey";

diff --git a/CFLogUtilities.h b/CFLogUtilities.h
index a9537f22c38daef53af046bfd80934147f86eaf2..18cae3cf59475d8b680d315f3c113e34dbf8c70d 100644 (file)
--- a/CFLogUtilities.h
+++ b/CFLogUtilities.h
@@ -20,6 +20,7 @@
  * 
  * @APPLE_LICENSE_HEADER_END@
  */
+
 /*     CFLogUtilities.h
        Copyright (c) 2004-2009, Apple Inc. All rights reserved.
 */

diff --git a/CFMachPort.c b/CFMachPort.c
index c16a76471ea48c5a93f5d21a62d00d6082c152ba..454780503ace35862c7672e0606b9ae2c6016667 100644 (file)
--- a/CFMachPort.c
+++ b/CFMachPort.c
@@ -20,6 +20,7 @@
  * 
  * @APPLE_LICENSE_HEADER_END@
  */
+
 /*     CFMachPort.c
        Copyright (c) 1998-2009, Apple Inc. All rights reserved.
        Responsibility: Christopher Kane

diff --git a/CFMachPort.h b/CFMachPort.h
index 4b4193daf187b3dd4aabcfa1eca2566e54426e3d..b3e034c75e4362510aaf800968ab3bf80f50be14 100644 (file)
--- a/CFMachPort.h
+++ b/CFMachPort.h
@@ -20,6 +20,7 @@
  * 
  * @APPLE_LICENSE_HEADER_END@
  */
+
 /*     CFMachPort.h
        Copyright (c) 1998-2009, Apple Inc. All rights reserved.
 */

diff --git a/CFMessagePort.c b/CFMessagePort.c
index f9c0964abde1107e3a6dac989eb3c9fc46cc9f1f..b8a92a92fad47a3c99297ef4bac88543f903cc23 100644 (file)
--- a/CFMessagePort.c
+++ b/CFMessagePort.c
@@ -20,6 +20,7 @@
  * 
  * @APPLE_LICENSE_HEADER_END@
  */
+
 /*     CFMessagePort.c
        Copyright (c) 1998-2009, Apple Inc. All rights reserved.
        Responsibility: Christopher Kane
@@ -144,54 +145,74 @@ CF_INLINE void __CFMessagePortUnlock(CFMessagePortRef ms) {
 // Just a heuristic
 #define __CFMessagePortMaxInlineBytes 4096*10
 
-struct __CFMessagePortMachMessage {
-    mach_msg_header_t head;
-    mach_msg_body_t body;
-    union {
-        mach_msg_ool_descriptor32_t _0;
-        mach_msg_ool_descriptor64_t _1;
-        mach_msg_ool_descriptor_t out_of_line;
-    } desc; // ignored for inline bytes messages
+struct __CFMessagePortMachMessage0 {
+    mach_msg_base_t base;
+    int32_t magic;
     int32_t msgid;
     int32_t byteslen;
     uint8_t bytes[0];
 };
 
-static struct __CFMessagePortMachMessage *__CFMessagePortCreateMessage(bool reply, mach_port_t port, mach_port_t replyPort, int32_t convid, int32_t msgid, const uint8_t *bytes, int32_t byteslen) {
+struct __CFMessagePortMachMessage1 {
+    mach_msg_base_t base;
+    mach_msg_ool_descriptor_t ool;
+    int32_t magic;
+    int32_t msgid;
+    int32_t byteslen;
+};
+
+#define MAGIC 0xF1F2F3F4
+
+#define MSGP0_FIELD(msgp, ident) ((struct __CFMessagePortMachMessage0 *)msgp)->ident
+#define MSGP1_FIELD(msgp, ident) ((struct __CFMessagePortMachMessage1 *)msgp)->ident
+#define MSGP_GET(msgp, ident) \
+    ((((mach_msg_base_t *)msgp)->body.msgh_descriptor_count) ? MSGP1_FIELD(msgp, ident) : MSGP0_FIELD(msgp, ident))
+
+static mach_msg_base_t *__CFMessagePortCreateMessage(bool reply, mach_port_t port, mach_port_t replyPort, int32_t convid, int32_t msgid, const uint8_t *bytes, int32_t byteslen) {
     if (__CFMessagePortMaxDataSize < byteslen) return NULL;
-    struct __CFMessagePortMachMessage *msg;
-    int32_t size = sizeof(struct __CFMessagePortMachMessage);
     int32_t rounded_byteslen = ((byteslen + 3) & ~0x3);
     if (rounded_byteslen <= __CFMessagePortMaxInlineBytes) {
-       size += rounded_byteslen;
-    }
-    msg = CFAllocatorAllocate(kCFAllocatorSystemDefault, size, 0);
+        int32_t size = sizeof(struct __CFMessagePortMachMessage0) + rounded_byteslen;
+        struct __CFMessagePortMachMessage0 *msg = CFAllocatorAllocate(kCFAllocatorSystemDefault, size, 0);
     if (!msg) return NULL;
     memset(msg, 0, size);
-    msg->head.msgh_id = convid;
-    msg->head.msgh_size = size;
-    msg->head.msgh_remote_port = port;
-    msg->head.msgh_local_port = replyPort;
-    msg->head.msgh_reserved = 0;
-//    msg->head.msgh_bits = MACH_MSGH_BITS(MACH_MSG_TYPE_COPY_SEND, (replyPort ? MACH_MSG_TYPE_MAKE_SEND : 0));
-    msg->head.msgh_bits = MACH_MSGH_BITS((reply ? MACH_MSG_TYPE_MOVE_SEND_ONCE : MACH_MSG_TYPE_COPY_SEND), (MACH_PORT_NULL != replyPort ? MACH_MSG_TYPE_MAKE_SEND_ONCE : 0));
+        msg->base.header.msgh_id = convid;
+        msg->base.header.msgh_size = size;
+        msg->base.header.msgh_remote_port = port;
+        msg->base.header.msgh_local_port = replyPort;
+        msg->base.header.msgh_reserved = 0;
+        msg->base.header.msgh_bits = MACH_MSGH_BITS((reply ? MACH_MSG_TYPE_MOVE_SEND_ONCE : MACH_MSG_TYPE_COPY_SEND), (MACH_PORT_NULL != replyPort ? MACH_MSG_TYPE_MAKE_SEND_ONCE : 0));
+       msg->base.body.msgh_descriptor_count = 0;
+        msg->magic = MAGIC;
     msg->msgid = CFSwapInt32HostToLittle(msgid);
     msg->byteslen = CFSwapInt32HostToLittle(byteslen);
-    if (rounded_byteslen <= __CFMessagePortMaxInlineBytes) {
-       msg->body.msgh_descriptor_count = 0;
        if (NULL != bytes && 0 < byteslen) {
            memmove(msg->bytes, bytes, byteslen);
        }
+        return (mach_msg_base_t *)msg;
     } else {
-       msg->head.msgh_bits |= MACH_MSGH_BITS_COMPLEX;
-       msg->body.msgh_descriptor_count = 1;
-       msg->desc.out_of_line.deallocate = false;
-       msg->desc.out_of_line.copy = MACH_MSG_VIRTUAL_COPY;
-       msg->desc.out_of_line.address = (void *)bytes;
-       msg->desc.out_of_line.size = byteslen;
-       msg->desc.out_of_line.type = MACH_MSG_OOL_DESCRIPTOR;
-    }
-    return msg;
+        int32_t size = sizeof(struct __CFMessagePortMachMessage1);
+        struct __CFMessagePortMachMessage1 *msg = CFAllocatorAllocate(kCFAllocatorSystemDefault, size, 0);
+        if (!msg) return NULL;
+        memset(msg, 0, size);
+        msg->base.header.msgh_id = convid;
+        msg->base.header.msgh_size = size;
+        msg->base.header.msgh_remote_port = port;
+        msg->base.header.msgh_local_port = replyPort;
+        msg->base.header.msgh_reserved = 0;
+        msg->base.header.msgh_bits = MACH_MSGH_BITS((reply ? MACH_MSG_TYPE_MOVE_SEND_ONCE : MACH_MSG_TYPE_COPY_SEND), (MACH_PORT_NULL != replyPort ? MACH_MSG_TYPE_MAKE_SEND_ONCE : 0));
+       msg->base.header.msgh_bits |= MACH_MSGH_BITS_COMPLEX;
+       msg->base.body.msgh_descriptor_count = 1;
+        msg->magic = MAGIC;
+        msg->msgid = CFSwapInt32HostToLittle(msgid);
+        msg->byteslen = CFSwapInt32HostToLittle(byteslen);
+       msg->ool.deallocate = false;
+       msg->ool.copy = MACH_MSG_VIRTUAL_COPY;
+       msg->ool.address = (void *)bytes;
+       msg->ool.size = byteslen;
+       msg->ool.type = MACH_MSG_OOL_DESCRIPTOR;
+        return (mach_msg_base_t *)msg;
+    }
 }
 
 static CFStringRef __CFMessagePortCopyDescription(CFTypeRef cf) {
@@ -766,8 +787,8 @@ void CFMessagePortSetInvalidationCallBack(CFMessagePortRef ms, CFMessagePortInva
 
 static void __CFMessagePortReplyCallBack(CFMachPortRef port, void *msg, CFIndex size, void *info) {
     CFMessagePortRef ms = info;
-    struct __CFMessagePortMachMessage *msgp = msg;
-    struct __CFMessagePortMachMessage *replymsg;
+    mach_msg_base_t *msgp = msg;
+    mach_msg_base_t *replymsg;
     __CFMessagePortLock(ms);
     if (!__CFMessagePortIsValid(ms)) {
        __CFMessagePortUnlock(ms);
@@ -776,55 +797,56 @@ static void __CFMessagePortReplyCallBack(CFMachPortRef port, void *msg, CFIndex
 
     int32_t byteslen = 0;
 
-    Boolean invalidComplex = (0 != msgp->body.msgh_descriptor_count) && !(msgp->head.msgh_bits & MACH_MSGH_BITS_COMPLEX);
-    invalidComplex = invalidComplex || ((msgp->head.msgh_bits & MACH_MSGH_BITS_COMPLEX) && (0 == msgp->body.msgh_descriptor_count));
-    Boolean wayTooBig = sizeof(struct __CFMessagePortMachMessage) + __CFMessagePortMaxInlineBytes < msgp->head.msgh_size;
-    Boolean wayTooSmall = msgp->head.msgh_size < sizeof(struct __CFMessagePortMachMessage);
+    Boolean invalidMagic = (MSGP_GET(msgp, magic) != MAGIC) && (CFSwapInt32(MSGP_GET(msgp, magic)) != MAGIC);
+    Boolean invalidComplex = (0 != msgp->body.msgh_descriptor_count) && !(msgp->header.msgh_bits & MACH_MSGH_BITS_COMPLEX);
+    invalidComplex = invalidComplex || ((msgp->header.msgh_bits & MACH_MSGH_BITS_COMPLEX) && (0 == msgp->body.msgh_descriptor_count));
+    Boolean wayTooBig = ((msgp->body.msgh_descriptor_count) ? sizeof(struct __CFMessagePortMachMessage1) : sizeof(struct __CFMessagePortMachMessage0) + __CFMessagePortMaxInlineBytes) < msgp->header.msgh_size;
+    Boolean wayTooSmall = msgp->header.msgh_size < sizeof(struct __CFMessagePortMachMessage0);
     Boolean wrongSize = false;
     if (!(invalidComplex || wayTooBig || wayTooSmall)) {
-        byteslen = CFSwapInt32LittleToHost(msgp->byteslen);
+        byteslen = CFSwapInt32LittleToHost(MSGP_GET(msgp, byteslen));
         wrongSize = (byteslen < 0) || (__CFMessagePortMaxDataSize < byteslen);
-        if (msgp->head.msgh_bits & MACH_MSGH_BITS_COMPLEX) {
-            wrongSize = wrongSize || (msgp->desc.out_of_line.size != byteslen);
+        if (0 != msgp->body.msgh_descriptor_count) {
+            wrongSize = wrongSize || (MSGP1_FIELD(msgp, ool).size != byteslen);
         } else {
-            wrongSize = wrongSize || (msgp->head.msgh_size - sizeof(struct __CFMessagePortMachMessage) < byteslen);
+            wrongSize = wrongSize || (msgp->header.msgh_size - sizeof(struct __CFMessagePortMachMessage0) < byteslen);
         }
     }
-    Boolean invalidMsgID = (0 <= msgp->head.msgh_id) && (msgp->head.msgh_id <= INT32_MAX); // conversation id
-    if (invalidComplex || wayTooBig || wayTooSmall || wrongSize || invalidMsgID) {
-        CFLog(kCFLogLevelWarning, CFSTR("*** CFMessagePort: dropping corrupt reply Mach message (0b%d%d%d%d%d)"), invalidComplex, wayTooBig, wayTooSmall, wrongSize, invalidMsgID);
+    Boolean invalidMsgID = (0 <= msgp->header.msgh_id) && (msgp->header.msgh_id <= INT32_MAX); // conversation id
+    if (invalidMagic || invalidComplex || wayTooBig || wayTooSmall || wrongSize || invalidMsgID) {
+        CFLog(kCFLogLevelWarning, CFSTR("*** CFMessagePort: dropping corrupt reply Mach message (0b%d%d%d%d%d%d)"), invalidMagic, invalidComplex, wayTooBig, wayTooSmall, wrongSize, invalidMsgID);
         mach_msg_destroy((mach_msg_header_t *)msgp);
         __CFMessagePortUnlock(ms);
         return;
     }
 
-    if (CFDictionaryContainsKey(ms->_replies, (void *)(uintptr_t)msgp->head.msgh_id)) {
+    if (CFDictionaryContainsKey(ms->_replies, (void *)(uintptr_t)msgp->header.msgh_id)) {
        CFDataRef reply = NULL;
-       replymsg = (struct __CFMessagePortMachMessage *)msg;
+       replymsg = (mach_msg_base_t *)msg;
        if (0 == replymsg->body.msgh_descriptor_count) {
-           uintptr_t msgp_extent = (uintptr_t)((uint8_t *)msgp + msgp->head.msgh_size);
-           uintptr_t data_extent = (uintptr_t)((uint8_t *)&(replymsg->bytes) + byteslen);
+           uintptr_t msgp_extent = (uintptr_t)((uint8_t *)msgp + msgp->header.msgh_size);
+           uintptr_t data_extent = (uintptr_t)((uint8_t *)&(MSGP0_FIELD(replymsg, bytes)) + byteslen);
            if (0 <= byteslen && data_extent <= msgp_extent) {
-               reply = CFDataCreate(kCFAllocatorSystemDefault, replymsg->bytes, byteslen);
+               reply = CFDataCreate(kCFAllocatorSystemDefault, MSGP0_FIELD(replymsg, bytes), byteslen);
            } else {
                reply = (void *)~0;     // means NULL data
            }
        } else {
 //#warning CF: should create a no-copy data here that has a custom VM-freeing allocator, and not vm_dealloc here
-           reply = CFDataCreate(kCFAllocatorSystemDefault, replymsg->desc.out_of_line.address, replymsg->desc.out_of_line.size);
-           vm_deallocate(mach_task_self(), (vm_address_t)replymsg->desc.out_of_line.address, replymsg->desc.out_of_line.size);
+           reply = CFDataCreate(kCFAllocatorSystemDefault, MSGP1_FIELD(replymsg, ool).address, MSGP1_FIELD(replymsg, ool).size);
+           vm_deallocate(mach_task_self(), (vm_address_t)MSGP1_FIELD(replymsg, ool).address, MSGP1_FIELD(replymsg, ool).size);
        }
-       CFDictionarySetValue(ms->_replies, (void *)(uintptr_t)msgp->head.msgh_id, (void *)reply);
+       CFDictionarySetValue(ms->_replies, (void *)(uintptr_t)msgp->header.msgh_id, (void *)reply);
     } else {   /* discard message */
        if (1 == msgp->body.msgh_descriptor_count) {
-           vm_deallocate(mach_task_self(), (vm_address_t)msgp->desc.out_of_line.address, msgp->desc.out_of_line.size);
+           vm_deallocate(mach_task_self(), (vm_address_t)MSGP1_FIELD(msgp, ool).address, MSGP1_FIELD(msgp, ool).size);
        }
     }
     __CFMessagePortUnlock(ms);
 }
 
 SInt32 CFMessagePortSendRequest(CFMessagePortRef remote, SInt32 msgid, CFDataRef data, CFTimeInterval sendTimeout, CFTimeInterval rcvTimeout, CFStringRef replyMode, CFDataRef *returnDatap) {
-    struct __CFMessagePortMachMessage *sendmsg;
+    mach_msg_base_t *sendmsg;
     CFRunLoopRef currentRL = CFRunLoopGetCurrent();
     CFRunLoopSourceRef source = NULL;
     CFDataRef reply = NULL;
@@ -878,7 +900,7 @@ SInt32 CFMessagePortSendRequest(CFMessagePortRef remote, SInt32 msgid, CFDataRef
        if (sendTimeout < 1.0) sendTimeout = 0.0;
        sendTimeOut = floor(sendTimeout);
     }
-    ret = mach_msg((mach_msg_header_t *)sendmsg, MACH_SEND_MSG|sendOpts, sendmsg->head.msgh_size, 0, MACH_PORT_NULL, sendTimeOut, MACH_PORT_NULL);
+    ret = mach_msg((mach_msg_header_t *)sendmsg, MACH_SEND_MSG|sendOpts, sendmsg->header.msgh_size, 0, MACH_PORT_NULL, sendTimeOut, MACH_PORT_NULL);
     if (KERN_SUCCESS != ret) {
        // need to deallocate the send-once right that might have been created
        if (replyMode != NULL) mach_port_deallocate(mach_task_self(), ((mach_msg_header_t *)sendmsg)->msgh_local_port);
@@ -939,8 +961,8 @@ static mach_port_t __CFMessagePortGetPort(void *info) {
 
 static void *__CFMessagePortPerform(void *msg, CFIndex size, CFAllocatorRef allocator, void *info) {
     CFMessagePortRef ms = info;
-    struct __CFMessagePortMachMessage *msgp = msg;
-    struct __CFMessagePortMachMessage *replymsg;
+    mach_msg_base_t *msgp = msg;
+    mach_msg_base_t *replymsg;
     void *context_info;
     void (*context_release)(const void *);
     CFDataRef returnData, data = NULL;
@@ -964,39 +986,39 @@ static void *__CFMessagePortPerform(void *msg, CFIndex size, CFAllocatorRef allo
 
     int32_t byteslen = 0;
 
-    Boolean invalidComplex = (0 != msgp->body.msgh_descriptor_count) && !(msgp->head.msgh_bits & MACH_MSGH_BITS_COMPLEX);
-    invalidComplex = invalidComplex || ((msgp->head.msgh_bits & MACH_MSGH_BITS_COMPLEX) && (0 == msgp->body.msgh_descriptor_count));
-    Boolean wayTooBig = sizeof(struct __CFMessagePortMachMessage) + __CFMessagePortMaxInlineBytes < msgp->head.msgh_size;
-    Boolean wayTooSmall = msgp->head.msgh_size < sizeof(struct __CFMessagePortMachMessage);
+    Boolean invalidMagic = (MSGP_GET(msgp, magic) != MAGIC) && (CFSwapInt32(MSGP_GET(msgp, magic)) != MAGIC);
+    Boolean invalidComplex = (0 != msgp->body.msgh_descriptor_count) && !(msgp->header.msgh_bits & MACH_MSGH_BITS_COMPLEX);
+    invalidComplex = invalidComplex || ((msgp->header.msgh_bits & MACH_MSGH_BITS_COMPLEX) && (0 == msgp->body.msgh_descriptor_count));
+    Boolean wayTooBig = ((msgp->body.msgh_descriptor_count) ? sizeof(struct __CFMessagePortMachMessage1) : sizeof(struct __CFMessagePortMachMessage0) + __CFMessagePortMaxInlineBytes) < msgp->header.msgh_size;
+    Boolean wayTooSmall = msgp->header.msgh_size < sizeof(struct __CFMessagePortMachMessage0);
     Boolean wrongSize = false;
     if (!(invalidComplex || wayTooBig || wayTooSmall)) {
-        byteslen = CFSwapInt32LittleToHost(msgp->byteslen);
+        byteslen = CFSwapInt32LittleToHost(MSGP_GET(msgp, byteslen));
         wrongSize = (byteslen < 0) || (__CFMessagePortMaxDataSize < byteslen);
-        if (msgp->head.msgh_bits & MACH_MSGH_BITS_COMPLEX) {
-            wrongSize = wrongSize || (msgp->desc.out_of_line.size != byteslen);
+        if (0 != msgp->body.msgh_descriptor_count) {
+            wrongSize = wrongSize || (MSGP1_FIELD(msgp, ool).size != byteslen);
         } else {
-            wrongSize = wrongSize || (msgp->head.msgh_size - sizeof(struct __CFMessagePortMachMessage) < byteslen);
+            wrongSize = wrongSize || (msgp->header.msgh_size - sizeof(struct __CFMessagePortMachMessage0) < byteslen);
         }
     }
-    Boolean invalidMsgID = (msgp->head.msgh_id <= 0) || (INT32_MAX < msgp->head.msgh_id); // conversation id
-    if (invalidComplex || wayTooBig || wayTooSmall || wrongSize || invalidMsgID) {
-        mach_msg_security_trailer_t *trailer = (void *)msgp + msgp->head.msgh_size;
-       CFLog(kCFLogLevelWarning, CFSTR("*** CFMessagePort: dropping corrupt request Mach message (0b%d%d%d%d%d)"), invalidComplex, wayTooBig, wayTooSmall, wrongSize, invalidMsgID);
+    Boolean invalidMsgID = (msgp->header.msgh_id <= 0) || (INT32_MAX < msgp->header.msgh_id); // conversation id
+    if (invalidMagic || invalidComplex || wayTooBig || wayTooSmall || wrongSize || invalidMsgID) {
+       CFLog(kCFLogLevelWarning, CFSTR("*** CFMessagePort: dropping corrupt request Mach message (0b%d%d%d%d%d%d)"), invalidMagic, invalidComplex, wayTooBig, wayTooSmall, wrongSize, invalidMsgID);
         mach_msg_destroy((mach_msg_header_t *)msgp);
         return NULL;
     }
 
     /* Create no-copy, no-free-bytes wrapper CFData */
     if (0 == msgp->body.msgh_descriptor_count) {
-       uintptr_t msgp_extent = (uintptr_t)((uint8_t *)msgp + msgp->head.msgh_size);
-       uintptr_t data_extent = (uintptr_t)((uint8_t *)&(msgp->bytes) + byteslen);
-       msgid = CFSwapInt32LittleToHost(msgp->msgid);
+       uintptr_t msgp_extent = (uintptr_t)((uint8_t *)msgp + msgp->header.msgh_size);
+       uintptr_t data_extent = (uintptr_t)((uint8_t *)&(MSGP0_FIELD(msgp, bytes)) + byteslen);
+       msgid = CFSwapInt32LittleToHost(MSGP_GET(msgp, msgid));
        if (0 <= byteslen && data_extent <= msgp_extent) {
-           data = CFDataCreateWithBytesNoCopy(allocator, msgp->bytes, byteslen, kCFAllocatorNull);
+           data = CFDataCreateWithBytesNoCopy(allocator, MSGP0_FIELD(msgp, bytes), byteslen, kCFAllocatorNull);
        }
     } else {
-       msgid = CFSwapInt32LittleToHost(msgp->msgid);
-       data = CFDataCreateWithBytesNoCopy(allocator, msgp->desc.out_of_line.address, msgp->desc.out_of_line.size, kCFAllocatorNull);
+       msgid = CFSwapInt32LittleToHost(MSGP_GET(msgp, msgid));
+       data = CFDataCreateWithBytesNoCopy(allocator, MSGP1_FIELD(msgp, ool).address, MSGP1_FIELD(msgp, ool).size, kCFAllocatorNull);
     }
     returnData = ms->_callout(ms, msgid, data, context_info);
     /* Now, returnData could be (1) NULL, (2) an ordinary data < MAX_INLINE,
@@ -1028,13 +1050,13 @@ static void *__CFMessagePortPerform(void *msg, CFIndex size, CFAllocatorRef allo
            memmove(return_bytes, CFDataGetBytePtr(returnData), return_len);
        }
     }
-    replymsg = __CFMessagePortCreateMessage(true, msgp->head.msgh_remote_port, MACH_PORT_NULL, -1 * (int32_t)msgp->head.msgh_id, msgid, return_bytes, return_len);
+    replymsg = __CFMessagePortCreateMessage(true, msgp->header.msgh_remote_port, MACH_PORT_NULL, -1 * (int32_t)msgp->header.msgh_id, msgid, return_bytes, return_len);
     if (1 == replymsg->body.msgh_descriptor_count) {
-       replymsg->desc.out_of_line.deallocate = true;
+       MSGP1_FIELD(replymsg, ool).deallocate = true;
     }
     if (data) CFRelease(data);
     if (1 == msgp->body.msgh_descriptor_count) {
-       vm_deallocate(mach_task_self(), (vm_address_t)msgp->desc.out_of_line.address, msgp->desc.out_of_line.size);
+       vm_deallocate(mach_task_self(), (vm_address_t)MSGP1_FIELD(msgp, ool).address, MSGP1_FIELD(msgp, ool).size);
     }
     if (returnData) CFRelease(returnData);
     if (context_release) {

diff --git a/CFMessagePort.h b/CFMessagePort.h
index c2974f6c4fa3efe8729a014df49ca4e83e7f58d6..5a6bb4a8148b6602bbdf8e436084becd67f60f71 100644 (file)
--- a/CFMessagePort.h
+++ b/CFMessagePort.h
@@ -20,6 +20,7 @@
  * 
  * @APPLE_LICENSE_HEADER_END@
  */
+
 /*     CFMessagePort.h
        Copyright (c) 1998-2009, Apple Inc. All rights reserved.
 */

diff --git a/CFNumber.c b/CFNumber.c
index 46a61948a445ee319264f682d2b0441e06f9b2af..245192e5792f8c2d6347f3fbc9356f719177022c 100644 (file)
--- a/CFNumber.c
+++ b/CFNumber.c
@@ -20,6 +20,7 @@
  * 
  * @APPLE_LICENSE_HEADER_END@
  */
+
 /*     CFNumber.c
        Copyright (c) 1999-2009, Apple Inc. All rights reserved.
        Responsibility: Ali Ozer

diff --git a/CFNumber.h b/CFNumber.h
index 4352b0562a2f4522b5101b72d78354ece0885c2e..5173bb2aef8534c211a466109a7fbd8833711479 100644 (file)
--- a/CFNumber.h
+++ b/CFNumber.h
@@ -20,6 +20,7 @@
  * 
  * @APPLE_LICENSE_HEADER_END@
  */
+
 /*     CFNumber.h
        Copyright (c) 1999-2009, Apple Inc. All rights reserved.
 */

diff --git a/CFNumberFormatter.c b/CFNumberFormatter.c
index cde8c2b303590310ca9fe414721d399dbc7e1dd9..83ec597e8cf98f19f43cbe6bfca403d566375806 100644 (file)
--- a/CFNumberFormatter.c
+++ b/CFNumberFormatter.c
@@ -20,6 +20,7 @@
  * 
  * @APPLE_LICENSE_HEADER_END@
  */
+
 /*     CFNumberFormatter.c
        Copyright (c) 2002-2009, Apple Inc. All rights reserved.
        Responsibility: Christopher Kane

diff --git a/CFNumberFormatter.h b/CFNumberFormatter.h
index ace9c751b55adc70f33437345523913172f31eb9..3fde5a8f1692467a34f8373bffc18434f4a6040c 100644 (file)
--- a/CFNumberFormatter.h
+++ b/CFNumberFormatter.h
@@ -20,6 +20,7 @@
  * 
  * @APPLE_LICENSE_HEADER_END@
  */
+
 /*     CFNumberFormatter.h
        Copyright (c) 2003-2009, Apple Inc. All rights reserved.
 */

diff --git a/CFPlatform.c b/CFPlatform.c
index 22ec9c00496c6ab9eaa7b890d84204d6731e05bd..a840ae4a7ee76f0de9c7e1b6ea20616798507fd3 100644 (file)
--- a/CFPlatform.c
+++ b/CFPlatform.c
@@ -20,6 +20,7 @@
  * 
  * @APPLE_LICENSE_HEADER_END@
  */
+
 /*     CFPlatform.c
        Copyright (c) 1999-2009, Apple Inc. All rights reserved.
        Responsibility: Christopher Kane

diff --git a/CFPlatformConverters.c b/CFPlatformConverters.c
index 440372e732e50218ca95aec89845c92ec98b7d87..b235a9fe0f0bf9c25df1098527495d5b4ed3fae5 100644 (file)
--- a/CFPlatformConverters.c
+++ b/CFPlatformConverters.c
@@ -20,6 +20,7 @@
  * 
  * @APPLE_LICENSE_HEADER_END@
  */
+
 /*     CFPlatformConverters.c
        Copyright (c) 1998-2009, Apple Inc. All rights reserved.
        Responsibility: Aki Inoue

diff --git a/CFPlugIn.c b/CFPlugIn.c
index 7ed4cdd147d2cbdb8fbb746579371eeeb3192292..8b48badcfed2a8eb328939227c2d0fc479c057f4 100644 (file)
--- a/CFPlugIn.c
+++ b/CFPlugIn.c
@@ -20,6 +20,7 @@
  * 
  * @APPLE_LICENSE_HEADER_END@
  */
+
 /*      CFPlugIn.c
         Copyright (c) 1999-2009, Apple Inc.  All rights reserved.
         Responsibility: Doug Davidson

diff --git a/CFPlugIn.h b/CFPlugIn.h
index ff4ef32eaec14edbbd513c2594d76db4c11801d2..c044be314fb8a3a75d32eeafed052db6ff04f49d 100644 (file)
--- a/CFPlugIn.h
+++ b/CFPlugIn.h
@@ -20,6 +20,7 @@
  * 
  * @APPLE_LICENSE_HEADER_END@
  */
+
 /*     CFPlugIn.h
        Copyright (c) 1999-2009, Apple Inc.  All rights reserved.
 */

diff --git a/CFPlugInCOM.h b/CFPlugInCOM.h
index 33678266eced92aa8581ce27d573b084a6c859e8..a31c9dd250ae0d701888c07955bd7ec255ae4416 100644 (file)
--- a/CFPlugInCOM.h
+++ b/CFPlugInCOM.h
@@ -20,6 +20,7 @@
  * 
  * @APPLE_LICENSE_HEADER_END@
  */
+
 /*     CFPlugInCOM.h
        Copyright (c) 1999-2009, Apple Inc.  All rights reserved.
 */

diff --git a/CFPlugIn_Factory.c b/CFPlugIn_Factory.c
index c30e7f9be84d541f085e409b3e0da2277e5b870f..70eee0b37944e88fd6dd7a883f87bdf0d9f310fe 100644 (file)
--- a/CFPlugIn_Factory.c
+++ b/CFPlugIn_Factory.c
@@ -20,6 +20,7 @@
  * 
  * @APPLE_LICENSE_HEADER_END@
  */
+
 /*     CFPlugIn_Factory.c
        Copyright (c) 1999-2009, Apple Inc.  All rights reserved.
        Responsibility: Doug Davidson

diff --git a/CFPlugIn_Factory.h b/CFPlugIn_Factory.h
index 9b51b294233d06ceda39be338902ceada53e29c0..e606087b36ada391a59226b2993a191c58521602 100644 (file)
--- a/CFPlugIn_Factory.h
+++ b/CFPlugIn_Factory.h
@@ -20,6 +20,7 @@
  * 
  * @APPLE_LICENSE_HEADER_END@
  */
+
 /*     CFPlugIn_Factory.h
        Copyright (c) 1999-2009, Apple Inc.  All rights reserved.
 */

diff --git a/CFPlugIn_Instance.c b/CFPlugIn_Instance.c
index 6f900c228770870b96790bfd96913cf5b56017c0..7ec2dc858d33e171c671126fbb9e0b563c45cc66 100644 (file)
--- a/CFPlugIn_Instance.c
+++ b/CFPlugIn_Instance.c
@@ -20,6 +20,7 @@
  * 
  * @APPLE_LICENSE_HEADER_END@
  */
+
 /*     CFPlugIn_Instance.c
        Copyright (c) 1999-2009, Apple Inc.  All rights reserved.
        Responsibility: Doug Davidson

diff --git a/CFPlugIn_PlugIn.c b/CFPlugIn_PlugIn.c
index 879188c3f90b6edb90b430f3fbc2870bec89a7f5..50cc9cad01d715b29e46e058cf086a740adcd3c1 100644 (file)
--- a/CFPlugIn_PlugIn.c
+++ b/CFPlugIn_PlugIn.c
@@ -20,6 +20,7 @@
  * 
  * @APPLE_LICENSE_HEADER_END@
  */
+
 /*      CFPlugIn_PlugIn.c
         Copyright (c) 1999-2009, Apple Inc.  All rights reserved.
         Responsibility: Doug Davidson

diff --git a/CFPreferences.c b/CFPreferences.c
index fe25404ab36bd1d173ca1f982a8ad540710f6e41..f9d56654e4a670e79d21f670e71fc9402429907b 100644 (file)
--- a/CFPreferences.c
+++ b/CFPreferences.c
@@ -20,6 +20,7 @@
  * 
  * @APPLE_LICENSE_HEADER_END@
  */
+
 /*     CFPreferences.c
        Copyright (c) 1998-2009, Apple Inc. All rights reserved.
        Responsibility: Chris Parker

diff --git a/CFPreferences.h b/CFPreferences.h
index a026cd62de44677f2e9838b48c9c2fa19720257e..3a4a5bb4799b6b052149d024892e14e01c39c544 100644 (file)
--- a/CFPreferences.h
+++ b/CFPreferences.h
@@ -20,6 +20,7 @@
  * 
  * @APPLE_LICENSE_HEADER_END@
  */
+
 /*     CFPreferences.h
        Copyright (c) 1998-2009, Apple Inc. All rights reserved.
 */

diff --git a/CFPriv.h b/CFPriv.h
index 56e28a00c55d095b8de744d04b359d5ea3a98f21..0d34c2d881dceda2f510c6d3e5c2c7989f8edf39 100644 (file)
--- a/CFPriv.h
+++ b/CFPriv.h
@@ -20,6 +20,7 @@
  * 
  * @APPLE_LICENSE_HEADER_END@
  */
+
 /*     CFPriv.h
        Copyright (c) 1998-2009, Apple Inc. All rights reserved.
 */

diff --git a/CFPropertyList.c b/CFPropertyList.c
index f7f437e7d8e7e905b91cbb9770509354dd3b6a52..9650ed0bfef7ec69991eb94428515118794aa56b 100644 (file)
--- a/CFPropertyList.c
+++ b/CFPropertyList.c
@@ -20,6 +20,7 @@
  * 
  * @APPLE_LICENSE_HEADER_END@
  */
+
 /*     CFPropertyList.c
        Copyright (c) 1999-2009, Apple Inc. All rights reserved.
        Responsibility: Tony Parker
@@ -1162,7 +1163,7 @@ static CFStringRef _uniqueStringForString(_CFXMLPlistParseInfo *pInfo, CFStringR
     if (!uniqued) {
         uniqued = (CFStringRef)__CFStringCollectionCopy(pInfo->allocator, stringToUnique);
         CFSetAddValue(pInfo->stringSet, uniqued);
-        CFRelease(uniqued);
+        __CFTypeCollectionRelease(pInfo->allocator, uniqued);
     }
     return uniqued;
 }

diff --git a/CFPropertyList.h b/CFPropertyList.h
index f61a87a1e3614b3f45c4387ab39aae8caa2fa80d..8052fa958c35055a4fd8ef701d3ceb41273a1e9d 100644 (file)
--- a/CFPropertyList.h
+++ b/CFPropertyList.h
@@ -20,6 +20,7 @@
  * 
  * @APPLE_LICENSE_HEADER_END@
  */
+
 /*     CFPropertyList.h
        Copyright (c) 1998-2009, Apple Inc. All rights reserved.
 */

diff --git a/CFRunLoop.c b/CFRunLoop.c
index 4527d19cbcdfeba41c6ccaf0624a956f6987dc3d..d58bc34c4f3fcd563337f403d13bf7acdf444f8c 100644 (file)
--- a/CFRunLoop.c
+++ b/CFRunLoop.c
@@ -20,6 +20,7 @@
  * 
  * @APPLE_LICENSE_HEADER_END@
  */
+
 /*     CFRunLoop.c
        Copyright (c) 1998-2009, Apple Inc. All rights reserved.
        Responsibility: Christopher Kane
@@ -2071,6 +2072,33 @@ static int32_t __CFRunLoopRun(CFRunLoopRef rl, CFRunLoopModeRef rlm, CFTimeInter
 
         sourceHandledThisLoop = __CFRunLoopDoSources0(rl, rlm, stopAfterHandle) || sourceHandledThisLoop;
 
+#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED
+        if (MACH_PORT_NULL != dispatchPort) {
+            msg = (mach_msg_header_t *)buffer;
+            msg->msgh_size = sizeof(buffer);
+            msg->msgh_bits = 0;
+            msg->msgh_local_port = dispatchPort;
+            msg->msgh_remote_port = MACH_PORT_NULL;
+            msg->msgh_id = 0;
+            ret = mach_msg(msg, MACH_RCV_MSG|MACH_RCV_LARGE|MACH_RCV_TIMEOUT|MACH_RCV_TRAILER_TYPE(MACH_MSG_TRAILER_FORMAT_0)|MACH_RCV_TRAILER_ELEMENTS(MACH_RCV_TRAILER_AV), 0, msg->msgh_size, dispatchPort, 0, MACH_PORT_NULL);
+
+            if (MACH_MSG_SUCCESS == ret) {
+                __CFRunLoopModeUnlock(rlm);
+                pthread_setspecific(__CFTSDKeyIsInGCDMainQ, (void *)3);
+                _dispatch_main_queue_callback_4CF(msg);
+                sourceHandledThisLoop = true;
+                pthread_setspecific(__CFTSDKeyIsInGCDMainQ, (void *)0);
+                __CFRunLoopLock(rl);
+                __CFRunLoopModeLock(rlm);
+               __CFRunLoopUnlock(rl);
+            } else if (MACH_RCV_TIMED_OUT == ret) {
+                msg = NULL;
+            } else {
+                HALT;
+            }
+        }
+#endif
+
        if (sourceHandledThisLoop) {
            poll = true;
            if (rl->_blocks_head) {

diff --git a/CFRunLoop.h b/CFRunLoop.h
index e47aa72ead06d42ff582ba1e74c2d30603595cf9..14088b86b41e1192a6989ffe6bc8217965cf8aae 100644 (file)
--- a/CFRunLoop.h
+++ b/CFRunLoop.h
@@ -20,6 +20,7 @@
  * 
  * @APPLE_LICENSE_HEADER_END@
  */
+
 /*     CFRunLoop.h
        Copyright (c) 1998-2009, Apple Inc. All rights reserved.
 */

diff --git a/CFRuntime.c b/CFRuntime.c
index f2544ef48f4a3fc4ae5b3ef6025bc70966853a3e..b596782c299b2afc01ec440c7117140346881437 100644 (file)
--- a/CFRuntime.c
+++ b/CFRuntime.c
@@ -20,6 +20,7 @@
  * 
  * @APPLE_LICENSE_HEADER_END@
  */
+
 /*     CFRuntime.c
        Copyright (c) 1999-2009, Apple Inc. All rights reserved.
        Responsibility: Christopher Kane
@@ -282,6 +283,10 @@ __private_extern__ uint8_t __CFDeallocateZombies = 0;
 static void *_original_objc_dealloc = 0;
 #endif
 
+void _CFEnableZombies(void) {
+    __CFZombieEnabled = 0xFF;
+}
+
 #endif /* DEBUG */
 
 // XXX_PCB:  use the class version field as a bitmask, to allow classes to opt-in for GC scanning.
@@ -822,6 +827,8 @@ extern void __CFUUIDInitialize(void);
 extern void __CFBinaryHeapInitialize(void);
 extern void __CFBitVectorInitialize(void);
 #if DEPLOYMENT_TARGET_WINDOWS
+extern void __CFWindowsMessageQueueInitialize(void);
+extern void __CFWindowsNamedPipeInitialize(void);
 extern void __CFBaseCleanup(void);
 #endif
 extern void __CFStreamInitialize(void);
@@ -1255,23 +1262,25 @@ CF_EXPORT CFTypeRef _CFRetain(CFTypeRef cf) {
     } while (__builtin_expect(!success, 0));
 #endif
     if (!didAuto && __builtin_expect(__CFOASafe, 0)) {
-       __CFRecordAllocationEvent(__kCFRetainEvent, (void *)cf, 0, CFGetRetainCount(cf), NULL);
+       __CFRecordAllocationEvent(__kCFRetainEvent, (void *)cf, 0, 0, NULL);
     }
     return cf;
 }
 
 CF_EXPORT void _CFRelease(CFTypeRef cf) {
-    Boolean isAllocator = false;
+    CFTypeID typeID = __CFGenericTypeID_inline(cf);
+    Boolean isAllocator = (__kCFAllocatorTypeID_CONST == typeID);
     Boolean didAuto = false;
 #if __LP64__
     uint32_t lowBits;
     do {
        lowBits = ((CFRuntimeBase *)cf)->_rc;
-       if (0 == lowBits) return;       // Constant CFTypeRef
+       if (0 == lowBits) {
+           if (CF_IS_COLLECTABLE(cf)) auto_zone_release(auto_zone(), (void*)cf);
+           return;        // Constant CFTypeRef
+       }
        if (1 == lowBits) {
            // CANNOT WRITE ANY NEW VALUE INTO [CF_RC_BITS] UNTIL AFTER FINALIZATION
-           CFTypeID typeID = __CFGenericTypeID_inline(cf);
-           isAllocator = (__kCFAllocatorTypeID_CONST == typeID);
             CFRuntimeClass *cfClass = __CFRuntimeClassTable[typeID];
             if (cfClass->version & _kCFRuntimeResourcefulObject && cfClass->reclaim != NULL) {
                 cfClass->reclaim(cf);
@@ -1301,7 +1310,10 @@ CF_EXPORT void _CFRelease(CFTypeRef cf) {
 #else
     volatile UInt32 *infoLocation = (UInt32 *)&(((CFRuntimeBase *)cf)->_cfinfo);
     CFIndex rcLowBits = __CFBitfieldGetValue(*infoLocation, RC_END, RC_START);
-    if (__builtin_expect(0 == rcLowBits, 0)) return;        // Constant CFTypeRef
+    if (__builtin_expect(0 == rcLowBits, 0)) {
+        if (CF_IS_COLLECTABLE(cf)) auto_zone_release(auto_zone(), (void*)cf);
+        return;        // Constant CFTypeRef
+    }
     bool success = 0;
     do {
         UInt32 initialCheckInfo = *infoLocation;
@@ -1309,7 +1321,6 @@ CF_EXPORT void _CFRelease(CFTypeRef cf) {
         if (__builtin_expect(1 == rcLowBits, 0)) {
             // we think cf should be deallocated
            // CANNOT WRITE ANY NEW VALUE INTO [CF_RC_BITS] UNTIL AFTER FINALIZATION
-           CFTypeID typeID = __CFGenericTypeID_inline(cf);
            CFRuntimeClass *cfClass = __CFRuntimeClassTable[typeID];
            if (cfClass->version & _kCFRuntimeResourcefulObject && cfClass->reclaim != NULL) {
                cfClass->reclaim(cf);
@@ -1323,15 +1334,12 @@ CF_EXPORT void _CFRelease(CFTypeRef cf) {
                    didAuto = true;
                }
              } else {
-               if (__builtin_expect(__kCFAllocatorTypeID_CONST == typeID, 0)) {
-                   if (!didAuto && __builtin_expect(__CFOASafe, 0)) {
-                       __CFRecordAllocationEvent(__kCFReleaseEvent, (void *)cf, 0, 0, NULL);
-                   }
-                   __CFAllocatorDeallocate((void *)cf);
-                   success = 1;
+               if (isAllocator) {
+                   goto really_free;
                } else {
-                   if (NULL != __CFRuntimeClassTable[typeID]->finalize) {
-                       __CFRuntimeClassTable[typeID]->finalize(cf);
+                    void (*func)(CFTypeRef) = __CFRuntimeClassTable[typeID]->finalize;
+                    if (NULL != func) {
+                       func(cf);
                    }
                    // We recheck rcLowBits to see if the object has been retained again during
                    // the finalization process.  This allows for the finalizer to resurrect,
@@ -1372,7 +1380,7 @@ CF_EXPORT void _CFRelease(CFTypeRef cf) {
 
 #endif
     if (!didAuto && __builtin_expect(__CFOASafe, 0)) {
-       __CFRecordAllocationEvent(__kCFReleaseEvent, (void *)cf, 0, CFGetRetainCount(cf), NULL);
+       __CFRecordAllocationEvent(__kCFReleaseEvent, (void *)cf, 0, 0, NULL);
     }
     return;
 
@@ -1382,16 +1390,16 @@ CF_EXPORT void _CFRelease(CFTypeRef cf) {
        __CFRecordAllocationEvent(__kCFReleaseEvent, (void *)cf, 0, 0, NULL);
     }
     // cannot zombify allocators, which get deallocated by __CFAllocatorDeallocate (finalize)
-    if (!isAllocator) {
-       CFAllocatorRef allocator;
-       Boolean usesSystemDefaultAllocator;
-
-       if (__CFBitfieldGetValue(((const CFRuntimeBase *)cf)->_cfinfo[CF_INFO_BITS], 7, 7)) {
-           allocator = kCFAllocatorSystemDefault;
+    if (isAllocator) {
+        __CFAllocatorDeallocate((void *)cf);
        } else {
+       CFAllocatorRef allocator = kCFAllocatorSystemDefault;
+       Boolean usesSystemDefaultAllocator = true;
+
+       if (!__CFBitfieldGetValue(((const CFRuntimeBase *)cf)->_cfinfo[CF_INFO_BITS], 7, 7)) {
            allocator = CFGetAllocator(cf);
-       }
        usesSystemDefaultAllocator = (allocator == kCFAllocatorSystemDefault);
+       }
 
        if (__CFZombieEnabled && !kCFUseCollectableAllocator) {
            Class cls = object_getClass((id)cf);

diff --git a/CFRuntime.h b/CFRuntime.h
index c38563723bbbbea8b437c4f39e402e464bd2f1de..e634efce27f21b27d0f29168120ac8b0fab0ee74 100644 (file)
--- a/CFRuntime.h
+++ b/CFRuntime.h
@@ -20,6 +20,7 @@
  * 
  * @APPLE_LICENSE_HEADER_END@
  */
+
 /*     CFRuntime.h
        Copyright (c) 1999-2009, Apple Inc. All rights reserved.
 */

diff --git a/CFSet.c b/CFSet.c
index 6c84711ea3522accbb726fa65d3ed2d3d664c715..4881a64423047dcb2b6471a4a4f9588fd9dadd40 100644 (file)
--- a/CFSet.c
+++ b/CFSet.c
@@ -20,6 +20,7 @@
  * 
  * @APPLE_LICENSE_HEADER_END@
  */
+
 /*     CFSet.c
        Copyright 1998-2008, Apple, Inc. All rights reserved.
        Responsibility: Christopher Kane

diff --git a/CFSet.h b/CFSet.h
index e9c11e7ab21ee87fbe0500b6230996414beb8bf5..4833765279deb7e3cc8f865fd3e77a06c5e07a15 100644 (file)
--- a/CFSet.h
+++ b/CFSet.h
@@ -20,6 +20,7 @@
  * 
  * @APPLE_LICENSE_HEADER_END@
  */
+
 /*     CFSet.h
        Copyright (c) 1998-2009, Apple Inc. All rights reserved.
 */

diff --git a/CFSocket.c b/CFSocket.c
index 8f7e68d9a4ed12acd638e155b48bddcfd7a15034..357d2e3031e54c63e2e316d85715691ad90c5c3d 100644 (file)
--- a/CFSocket.c
+++ b/CFSocket.c
@@ -20,6 +20,7 @@
  * 
  * @APPLE_LICENSE_HEADER_END@
  */
+
 /*     CFSocket.c
        Copyright (c) 1999-2009, Apple Inc.  All rights reserved.
        Responsibility: Christopher Kane

diff --git a/CFSocket.h b/CFSocket.h
index 7e6f71c961350ba668683f363dfc9b0840a2bf70..94656cd9ae5ad4fd5f401b8c12ab5f13a3eb80e1 100644 (file)
--- a/CFSocket.h
+++ b/CFSocket.h
@@ -20,6 +20,7 @@
  * 
  * @APPLE_LICENSE_HEADER_END@
  */
+
 /*     CFSocket.h
        Copyright (c) 1999-2009, Apple Inc.  All rights reserved.
 */

diff --git a/CFSocketStream.c b/CFSocketStream.c
index 69d449faddb19cc2d922c02ab878ba86bf976fd6..d8a14b546ee56914f51c530fab854d56072011a4 100644 (file)
--- a/CFSocketStream.c
+++ b/CFSocketStream.c
@@ -20,6 +20,7 @@
  * 
  * @APPLE_LICENSE_HEADER_END@
  */
+
 /*     CFSocketStream.c
        Copyright (c) 2000-2009, Apple Inc. All rights reserved.
        Responsibility: Jeremy Wyld

diff --git a/CFSortFunctions.c b/CFSortFunctions.c
index 92750590e9e8c90f50bb84c715ceda6bcf1da8d6..b8e9bf21a0c076fa86ba6dda696429edbd203f4d 100644 (file)
--- a/CFSortFunctions.c
+++ b/CFSortFunctions.c
@@ -20,6 +20,7 @@
  * 
  * @APPLE_LICENSE_HEADER_END@
  */
+
 /*     CFSortFunctions.c
        Copyright (c) 1999-2009, Apple Inc. All rights reserved.
        Responsibility: Christopher Kane

diff --git a/CFStorage.c b/CFStorage.c
index 9257059105d74a2e63e688a82cb1cfa80153a6b2..8500024fdfc9631613b846dc0654c8d7b28d1ac2 100644 (file)
--- a/CFStorage.c
+++ b/CFStorage.c
@@ -20,6 +20,7 @@
  * 
  * @APPLE_LICENSE_HEADER_END@
  */
+
 /*     CFStorage.c
        Copyright (c) 1999-2009, Apple Inc. All rights reserved.
        Responsibility: Ali Ozer

diff --git a/CFStorage.h b/CFStorage.h
index 082861426eb4ce5a702f2610716a155b74282eff..c81ac964658c2dd4f8ef0018b19b89d8e96ecba4 100644 (file)
--- a/CFStorage.h
+++ b/CFStorage.h
@@ -20,6 +20,7 @@
  * 
  * @APPLE_LICENSE_HEADER_END@
  */
+
 /*     CFStorage.h
        Copyright (c) 1999-2009, Apple Inc. All rights reserved.
 */

diff --git a/CFStream.c b/CFStream.c
index 75e8d1f5c89e054c6a976fe65e2cacf3e12d36bf..d28ae16ca65cfe4408ff1eb19274f98b5ee9a2bd 100644 (file)
--- a/CFStream.c
+++ b/CFStream.c
@@ -20,6 +20,7 @@
  * 
  * @APPLE_LICENSE_HEADER_END@
  */
+
 /*     CFStream.c
        Copyright (c) 2000-2009, Apple Inc. All rights reserved.
        Responsibility: Becky Willrich

diff --git a/CFStream.h b/CFStream.h
index 092ca21fe0ff21ffe7a7326443dd1fd375fa8822..885c9bb18c676b8a31f40f51ccada03edf8b7326 100644 (file)
--- a/CFStream.h
+++ b/CFStream.h
@@ -20,6 +20,7 @@
  * 
  * @APPLE_LICENSE_HEADER_END@
  */
+
 /*     CFStream.h
        Copyright (c) 2000-2009, Apple Inc. All rights reserved.
 */

diff --git a/CFStreamAbstract.h b/CFStreamAbstract.h
index 20ff34ea5df2bafcb1139338aa0b4d7671711f6a..0b00af23fa9462ceca0f6d810e2fc93820302582 100644 (file)
--- a/CFStreamAbstract.h
+++ b/CFStreamAbstract.h
@@ -20,6 +20,7 @@
  * 
  * @APPLE_LICENSE_HEADER_END@
  */
+
 /*     CFStreamAbstract.h
        Copyright (c) 2000-2009, Apple Inc. All rights reserved.
 */

diff --git a/CFStreamInternal.h b/CFStreamInternal.h
index 279bf3dd095e63ae6998d7b3aa9bbe2d3f804924..01949e570923b59f3233bca4d9dce17bda731dce 100644 (file)
--- a/CFStreamInternal.h
+++ b/CFStreamInternal.h
@@ -20,6 +20,7 @@
  * 
  * @APPLE_LICENSE_HEADER_END@
  */
+
 #if !defined(__COREFOUNDATION_CFSTREAMINTERNAL__)
 #define __COREFOUNDATION_CFSTREAMINTERNAL__ 1
 

diff --git a/CFStreamPriv.h b/CFStreamPriv.h
index 4a8ccf128dc0b6709e9286c2c40306c87a895ed2..37e29f159ebec1eb899140e0b646de1cc33ef885 100644 (file)
--- a/CFStreamPriv.h
+++ b/CFStreamPriv.h
@@ -20,6 +20,7 @@
  * 
  * @APPLE_LICENSE_HEADER_END@
  */
+
 /*     CFStreamPriv.h
        Copyright (c) 2000-2009, Apple Inc. All rights reserved.
 */

diff --git a/CFString.c b/CFString.c
index ce1f36fb23d51c900cf0e1f3249e246e0da6ddd9..57e05632ed3d19187fe93a50d8239c7f83bc7ad1 100644 (file)
--- a/CFString.c
+++ b/CFString.c
@@ -20,6 +20,7 @@
  * 
  * @APPLE_LICENSE_HEADER_END@
  */
+
 /*     CFString.c
        Copyright (c) 1998-2009, Apple Inc. All rights reserved.
        Responsibility: Ali Ozer

diff --git a/CFString.h b/CFString.h
index 89abd364551103d030882b8573ac23f2217d1b63..ba0364fdd4e6ddf518b90b6519d222aad0a78a9f 100644 (file)
--- a/CFString.h
+++ b/CFString.h
@@ -20,6 +20,7 @@
  * 
  * @APPLE_LICENSE_HEADER_END@
  */
+
 /*     CFString.h
        Copyright (c) 1998-2009, Apple Inc. All rights reserved.
 */

diff --git a/CFStringDefaultEncoding.h b/CFStringDefaultEncoding.h
index 0adfe26064efe4df8d4473e6daf73230c7ef0a3a..4a4928565124a08110f4b6c74cbc8fc1c270be3f 100644 (file)
--- a/CFStringDefaultEncoding.h
+++ b/CFStringDefaultEncoding.h
@@ -20,6 +20,7 @@
  * 
  * @APPLE_LICENSE_HEADER_END@
  */
+
 /*     CFStringDefaultEncoding.h
        Copyright (c) 1998-2009, Apple Inc. All rights reserved.
 */

diff --git a/CFStringEncodingConverter.c b/CFStringEncodingConverter.c
index 52b24765c5c74646592650c278cf6d3e42e85d52..1f2ef4e3f04ba3d60138999b410fbdf7b13ae18c 100644 (file)
--- a/CFStringEncodingConverter.c
+++ b/CFStringEncodingConverter.c
@@ -20,6 +20,7 @@
  * 
  * @APPLE_LICENSE_HEADER_END@
  */
+
 /*     CFStringEncodingConverter.c
        Copyright (c) 1998-2009, Apple Inc. All rights reserved.
        Responsibility: Aki Inoue

diff --git a/CFStringEncodingConverter.h b/CFStringEncodingConverter.h
index 2334029ff50bfa06a184dd775d5c0ea0716f9133..31d09efee759145cd50992709f10056e1874f5a4 100644 (file)
--- a/CFStringEncodingConverter.h
+++ b/CFStringEncodingConverter.h
@@ -20,6 +20,7 @@
  * 
  * @APPLE_LICENSE_HEADER_END@
  */
+
 /*     CFStringEncodingConverter.h
        Copyright (c) 1998-2009, Apple Inc. All rights reserved.
 */

diff --git a/CFStringEncodingConverterExt.h b/CFStringEncodingConverterExt.h
index c394cee7eb3029855c9dcc36018950f22127b2e9..60111b3b7973bf34241157efd38c34f7d415a931 100644 (file)
--- a/CFStringEncodingConverterExt.h
+++ b/CFStringEncodingConverterExt.h
@@ -20,6 +20,7 @@
  * 
  * @APPLE_LICENSE_HEADER_END@
  */
+
 /*     CFStringEncodingConverterExt.h
        Copyright (c) 1998-2009, Apple Inc. All rights reserved.
 */

diff --git a/CFStringEncodingConverterPriv.h b/CFStringEncodingConverterPriv.h
index a8a6ccb83fb640c4286d8d63fd4551259232573c..7f36feec00a1e96184bd6016160a7656bd2d7d9e 100644 (file)
--- a/CFStringEncodingConverterPriv.h
+++ b/CFStringEncodingConverterPriv.h
@@ -20,6 +20,7 @@
  * 
  * @APPLE_LICENSE_HEADER_END@
  */
+
 /*     CFStringEncodingConverterPriv.h
        Copyright (c) 1998-2009, Apple Inc. All rights reserved.
 */

diff --git a/CFStringEncodingDatabase.c b/CFStringEncodingDatabase.c
index 715edd5e1e9e4587e0db2b3bb42fb191a4c8d581..ce578ba2286df8b5b66699038ab2e8f06dec1b21 100644 (file)
--- a/CFStringEncodingDatabase.c
+++ b/CFStringEncodingDatabase.c
@@ -20,6 +20,7 @@
  * 
  * @APPLE_LICENSE_HEADER_END@
  */
+
 /*
  *  CFStringEncodingDatabase.c
  *  CoreFoundation

diff --git a/CFStringEncodingDatabase.h b/CFStringEncodingDatabase.h
index 69dc960fa45753d27e6035cf38306c0fe727c70b..195aa959402ee34d6ed66036ebf031af4a8e6256 100644 (file)
--- a/CFStringEncodingDatabase.h
+++ b/CFStringEncodingDatabase.h
@@ -20,6 +20,7 @@
  * 
  * @APPLE_LICENSE_HEADER_END@
  */
+
 /*
  *  CFStringEncodingDatabase.h
  *  CoreFoundation

diff --git a/CFStringEncodingExt.h b/CFStringEncodingExt.h
index 4a00e00bc6a8f284424bddbad04f4e9f4c4c2396..06155fb44e973eee5fc9b3feba60302a084fc5c4 100644 (file)
--- a/CFStringEncodingExt.h
+++ b/CFStringEncodingExt.h
@@ -20,6 +20,7 @@
  * 
  * @APPLE_LICENSE_HEADER_END@
  */
+
 /*     CFStringEncodingExt.h
        Copyright (c) 1998-2009, Apple Inc. All rights reserved.
 */

diff --git a/CFStringEncodings.c b/CFStringEncodings.c
index 47fb7cf20d781fe3cc789ea5d6d8304e3ff3c81f..4f416030f8ee2c237b136bb49f036d4eba77dbbc 100644 (file)
--- a/CFStringEncodings.c
+++ b/CFStringEncodings.c
@@ -20,6 +20,7 @@
  * 
  * @APPLE_LICENSE_HEADER_END@
  */
+
 /*     CFStringEncodings.c
        Copyright (c) 1999-2009, Apple Inc. All rights reserved.
        Responsibility: Aki Inoue

diff --git a/CFStringScanner.c b/CFStringScanner.c
index e90a55dc5a13c34601bf5d35fd611ee12644efe5..de2191c79430ed6e5742618acd8fd46c839d7061 100644 (file)
--- a/CFStringScanner.c
+++ b/CFStringScanner.c
@@ -20,6 +20,7 @@
  * 
  * @APPLE_LICENSE_HEADER_END@
  */
+
 /*     CFStringScanner.c
        Copyright (c) 1999-2009, Apple Inc. All rights reserved.
        Responsibility: Ali Ozer

diff --git a/CFStringUtilities.c b/CFStringUtilities.c
index f13146dea291022bc7c4a92e022cb833666230ae..4300f67eb725e0fac513b87333ddfd92483f4d09 100644 (file)
--- a/CFStringUtilities.c
+++ b/CFStringUtilities.c
@@ -20,6 +20,7 @@
  * 
  * @APPLE_LICENSE_HEADER_END@
  */
+
 /*     CFStringUtilities.c
        Copyright (c) 1999-2009, Apple Inc. All rights reserved.
        Responsibility: Aki Inoue

diff --git a/CFSystemDirectories.c b/CFSystemDirectories.c
index 9801c8bf93d97422a5c3524933425e50b4092ce4..415f1bc195850ed1aaefe3bd50b08b0fd35fb85f 100644 (file)
--- a/CFSystemDirectories.c
+++ b/CFSystemDirectories.c
@@ -20,6 +20,7 @@
  * 
  * @APPLE_LICENSE_HEADER_END@
  */
+
 /*     CFSystemDirectories.c
        Copyright (c) 1997-2009, Apple Inc. All rights reserved.
        Responsibility: Ali Ozer

diff --git a/CFTimeZone.c b/CFTimeZone.c
index 3af1cc9dcb8764f1012a1aec6261c30964c92b5d..fae899cbabaaf8b42aacd3b18e4d65b7df4521bb 100644 (file)
--- a/CFTimeZone.c
+++ b/CFTimeZone.c
@@ -20,6 +20,7 @@
  * 
  * @APPLE_LICENSE_HEADER_END@
  */
+
 /*     CFTimeZone.c
        Copyright 1998-2002, Apple, Inc. All rights reserved.
        Responsibility: Christopher Kane

diff --git a/CFTimeZone.h b/CFTimeZone.h
index 91fe02a784f00ad3b08fca8fecc65dbe4d9b6f10..8d34b51422abe79b6d3ea0d6b1143f2f3b0b1e04 100644 (file)
--- a/CFTimeZone.h
+++ b/CFTimeZone.h
@@ -20,6 +20,7 @@
  * 
  * @APPLE_LICENSE_HEADER_END@
  */
+
 /*     CFTimeZone.h
        Copyright (c) 1998-2009, Apple Inc. All rights reserved.
 */

diff --git a/CFTree.c b/CFTree.c
index 4d6ff8f52ef471b00b6aaa42aa65ab6efec825d5..2074ddb36bf272eb976ff502b96a27cc1e766d2a 100644 (file)
--- a/CFTree.c
+++ b/CFTree.c
@@ -20,6 +20,7 @@
  * 
  * @APPLE_LICENSE_HEADER_END@
  */
+
 /*     CFTree.c
        Copyright (c) 1998-2009, Apple Inc. All rights reserved.
        Responsibility: Christopher Kane

diff --git a/CFTree.h b/CFTree.h
index 5e549be5a7d1d325c5420cb97312f662ca1eccaa..ad649ad55b100ce6ecfe81e78c3d38954480eeee 100644 (file)
--- a/CFTree.h
+++ b/CFTree.h
@@ -20,6 +20,7 @@
  * 
  * @APPLE_LICENSE_HEADER_END@
  */
+
 /*     CFTree.h
        Copyright (c) 1998-2009, Apple Inc. All rights reserved.
 */

diff --git a/CFURL.c b/CFURL.c
index dfeae68b5e870dc4d66164adcca50e92cc3a4f7c..1a87757bf3c1e562fe60b4230d840670c13080ce 100644 (file)
--- a/CFURL.c
+++ b/CFURL.c
@@ -20,6 +20,7 @@
  * 
  * @APPLE_LICENSE_HEADER_END@
  */
+
 /*     CFURL.c
        Copyright (c) 1998-2009, Apple Inc. All rights reserved.
        Responsibility: Becky Willrich
@@ -139,6 +140,13 @@ static UInt32 numNonUTF8EncodedURLs = 0;
 
 #define ASSERT_CHECK_PATHSTYLE(x) 0
 
+#if DEPLOYMENT_TARGET_WINDOWS
+#define PATH_SEP '\\'
+#define PATH_MAX MAX_PATH
+#else
+#define PATH_SEP '/'
+#endif
+
 //     In order to reduce the sizeof ( __CFURL ), move these items into a seperate structure which is
 //     only allocated when necessary.  In my tests, it's almost never needed -- very rarely does a CFURL have
 //     either a sanitized string or a reserved pointer for URLHandle.

diff --git a/CFURL.h b/CFURL.h
index 31ecc4411003be42577e29970ac23439698ad0fb..80bbc27bb6be0333a1ae703799ec38796085600e 100644 (file)
--- a/CFURL.h
+++ b/CFURL.h
@@ -20,6 +20,7 @@
  * 
  * @APPLE_LICENSE_HEADER_END@
  */
+
 /*     CFURL.h
        Copyright (c) 1998-2009, Apple Inc. All rights reserved.
 */

diff --git a/CFURLAccess.c b/CFURLAccess.c
index 2e0cae412b4d62fe990ce72ea31e9460b86ffb48..16af3b4597b5726426ff7d10c171c839b0012b18 100644 (file)
--- a/CFURLAccess.c
+++ b/CFURLAccess.c
@@ -20,6 +20,7 @@
  * 
  * @APPLE_LICENSE_HEADER_END@
  */
+
 /*     CFURLAccess.c
        Copyright (c) 1999-2009, Apple Inc. All rights reserved.
        Responsibility: Chris Linn

diff --git a/CFURLAccess.h b/CFURLAccess.h
index 32100c616d28f817a1449248d21f0be767fb86a5..96e23537b5c3257ec38d2e59c7cce23376feaa6b 100644 (file)
--- a/CFURLAccess.h
+++ b/CFURLAccess.h
@@ -20,6 +20,7 @@
  * 
  * @APPLE_LICENSE_HEADER_END@
  */
+
 /*     CFURLAccess.h
        Copyright (c) 1998-2009, Apple Inc. All rights reserved.
 */

diff --git a/CFUUID.c b/CFUUID.c
index 31ea3e2e1dd7f73a14252618283ba19a35ce4b3d..be21b795dec7704b6362c111de572373c0883a17 100644 (file)
--- a/CFUUID.c
+++ b/CFUUID.c
@@ -20,6 +20,7 @@
  * 
  * @APPLE_LICENSE_HEADER_END@
  */
+
 /*     CFUUID.c
        Copyright (c) 1999-2009, Apple Inc.  All rights reserved.
        Responsibility: Doug Davidson

diff --git a/CFUUID.h b/CFUUID.h
index acf726b6d3528159008bcca899e7b854527df935..823082a7bd03c6a7ab43d75d3790f3ee4bcad3ea 100644 (file)
--- a/CFUUID.h
+++ b/CFUUID.h
@@ -20,6 +20,7 @@
  * 
  * @APPLE_LICENSE_HEADER_END@
  */
+
 /*     CFUUID.h
        Copyright (c) 1999-2009, Apple Inc.  All rights reserved.
 */

diff --git a/CFUniChar.c b/CFUniChar.c
index e76b309e15092deb3422b7539ce7a3f8c73cde3a..31bb5fe018177458eae8ccacd80b97735406d78f 100644 (file)
--- a/CFUniChar.c
+++ b/CFUniChar.c
@@ -20,6 +20,7 @@
  * 
  * @APPLE_LICENSE_HEADER_END@
  */
+
 /*     CFUniChar.c
        Copyright (c) 2001-2009, Apple Inc. All rights reserved.
        Responsibility: Aki Inoue

diff --git a/CFUniChar.h b/CFUniChar.h
index 382d842bc441c183ffcd77ba9bd3f3bdcaf9d3f3..e3df9638f5ab743965bda9dfac784792fbd94e3e 100644 (file)
--- a/CFUniChar.h
+++ b/CFUniChar.h
@@ -20,6 +20,7 @@
  * 
  * @APPLE_LICENSE_HEADER_END@
  */
+
 /*     CFUniChar.h
        Copyright (c) 1998-2009, Apple Inc. All rights reserved.
 */

diff --git a/CFUniCharPriv.h b/CFUniCharPriv.h
index c9ca7f6fef5ece118197404d6447ad61e4b1aa6b..6563aef246b707daf8ce774248f5ef7fe585b21c 100644 (file)
--- a/CFUniCharPriv.h
+++ b/CFUniCharPriv.h
@@ -20,6 +20,7 @@
  * 
  * @APPLE_LICENSE_HEADER_END@
  */
+
 /*     CFUniCharPriv.h
        Copyright (c) 1998-2009, Apple Inc. All rights reserved.
 */

diff --git a/CFUnicodeDecomposition.c b/CFUnicodeDecomposition.c
index 46bcc4c9bd0f236c4aaaed223e86e8a6de462736..3a293ca28e9bedeb6fb7ea48363d1d3fb775e0e1 100644 (file)
--- a/CFUnicodeDecomposition.c
+++ b/CFUnicodeDecomposition.c
@@ -20,6 +20,7 @@
  * 
  * @APPLE_LICENSE_HEADER_END@
  */
+
 /*    CFUnicodeDecomposition.c
     Copyright (c) 1999-2009, Apple Inc. All rights reserved.
     Responsibility: Aki Inoue

diff --git a/CFUnicodeDecomposition.h b/CFUnicodeDecomposition.h
index 67166fbf525be801991b9665ddb66e10fa3ab742..a134877a869d40283b6a68718bae99f7273b2a97 100644 (file)
--- a/CFUnicodeDecomposition.h
+++ b/CFUnicodeDecomposition.h
@@ -20,6 +20,7 @@
  * 
  * @APPLE_LICENSE_HEADER_END@
  */
+
 /*
  *  CFUnicodeDecomposition.h
  *  CoreFoundation

diff --git a/CFUnicodePrecomposition.c b/CFUnicodePrecomposition.c
index 8a02e81fb057e92d87b435dd37fc0f7d0f8d6cc7..4b18ef48dacac88c91acfa25910cd7f5de2b2305 100644 (file)
--- a/CFUnicodePrecomposition.c
+++ b/CFUnicodePrecomposition.c
@@ -20,6 +20,7 @@
  * 
  * @APPLE_LICENSE_HEADER_END@
  */
+
 /*     CFUnicodePrecomposition.c
        Copyright (c) 1999-2009, Apple Inc. All rights reserved.
        Responsibility: Aki Inoue

diff --git a/CFUnicodePrecomposition.h b/CFUnicodePrecomposition.h
index 65d4e363e1491307e9d583bea77960f570bafda6..ef41758e94b2a95bf1e746e4503ff5fc10cfcedc 100644 (file)
--- a/CFUnicodePrecomposition.h
+++ b/CFUnicodePrecomposition.h
@@ -20,6 +20,7 @@
  * 
  * @APPLE_LICENSE_HEADER_END@
  */
+
 /*
  *  CFUnicodePrecomposition.h
  *  CoreFoundation

diff --git a/CFUserNotification.c b/CFUserNotification.c
index ee63e859fca5dfc93e5172da4a063fc9c70660ab..e9b6c317f66b0210e0b74dfb70c097ec089b6a0c 100644 (file)
--- a/CFUserNotification.c
+++ b/CFUserNotification.c
@@ -20,6 +20,7 @@
  * 
  * @APPLE_LICENSE_HEADER_END@
  */
+
 /*     CFUserNotification.c
        Copyright (c) 2000-2009, Apple Inc.  All rights reserved.
        Responsibility: Doug Davidson

diff --git a/CFUserNotification.h b/CFUserNotification.h
index aac876cc4bb2e2a11dce68bdbacb9a94c4c88323..82d9774dde23ed88f368db19a9b23fc69d8f6d41 100644 (file)
--- a/CFUserNotification.h
+++ b/CFUserNotification.h
@@ -20,6 +20,7 @@
  * 
  * @APPLE_LICENSE_HEADER_END@
  */
+
 /*     CFUserNotification.h
        Copyright (c) 2000-2009, Apple Inc.  All rights reserved.
 */

diff --git a/CFUtilities.c b/CFUtilities.c
index 3c6a7f51930cee9a707a2e0107b83d312cc5e168..c053613fb8929d22ce899144382773b81f5576f4 100644 (file)
--- a/CFUtilities.c
+++ b/CFUtilities.c
@@ -20,6 +20,7 @@
  * 
  * @APPLE_LICENSE_HEADER_END@
  */
+
 /*     CFUtilities.c
        Copyright (c) 1998-2009, Apple Inc. All rights reserved.
        Responsibility: Christopher Kane

diff --git a/CFVersion.c b/CFVersion.c
index 7ebe03f962fdb005bebf6bd8cbe81a90426608b6..e4704486e188e899357d2c1044a53bb6d6bbe862 100644 (file)
--- a/CFVersion.c
+++ b/CFVersion.c
@@ -20,5 +20,10 @@
  * 
  * @APPLE_LICENSE_HEADER_END@
  */
-const unsigned char kCFCoreFoundationVersionString[] = "@(#)PROGRAM:CoreFoundation  PROJECT:CoreFoundation-550  SYSTEM:Darwin  DEVELOPER:unknown  BUILT:" __DATE__ " " __TIME__ "\n";
-double kCFCoreFoundationVersionNumber = (double)550;
+
+/* CFVersion.c
+    Copyright 2009, Apple Inc. All rights reserved.
+    Responsibility: CFLite Team
+*/
+const unsigned char kCFCoreFoundationVersionString[] = "@(#)PROGRAM:CoreFoundation  PROJECT:CoreFoundation-550.13  SYSTEM:Darwin  DEVELOPER:unknown  BUILT:" __DATE__ " " __TIME__ "\n";
+double kCFCoreFoundationVersionNumber = (double)550.13;

diff --git a/CFXMLInputStream.c b/CFXMLInputStream.c
index 88e12404e0a02724808003de8f223e403802a592..5ce7e722074ef14263f5a2f8f8777691d02c44c1 100644 (file)
--- a/CFXMLInputStream.c
+++ b/CFXMLInputStream.c
@@ -20,6 +20,7 @@
  * 
  * @APPLE_LICENSE_HEADER_END@
  */
+
 /*     CFXMLInputStream.c
        Copyright (c) 1999-2009, Apple Inc. All rights reserved.
        Responsibility: Chris Parker

diff --git a/CFXMLInputStream.h b/CFXMLInputStream.h
index b0d6da737edd53cf25d8eba9426b77ed40f478b1..187b76a52eeea3c879e10812f6ac6cf3f553e8c5 100644 (file)
--- a/CFXMLInputStream.h
+++ b/CFXMLInputStream.h
@@ -20,6 +20,7 @@
  * 
  * @APPLE_LICENSE_HEADER_END@
  */
+
 /*     CFXMLInputStream.h
        Copyright (c) 2000-2009, Apple Inc. All rights reserved.
 */

diff --git a/CFXMLNode.c b/CFXMLNode.c
index 85d7a965aeefe59b3f21432d5953f7bcf3052234..9665929196a485e31ad530bb06d4d9d35868a0df 100644 (file)
--- a/CFXMLNode.c
+++ b/CFXMLNode.c
@@ -20,6 +20,7 @@
  * 
  * @APPLE_LICENSE_HEADER_END@
  */
+
 /*     CFXMLNode.c
        Copyright (c) 1998-2009, Apple Inc. All rights reserved.
        Responsibility: Chris Parker

diff --git a/CFXMLNode.h b/CFXMLNode.h
index 0e8717c395475839b8223d1ca29459f5125a6df1..8ff2ad0d8d3e30b3a4ede35273bdfd309b691628 100644 (file)
--- a/CFXMLNode.h
+++ b/CFXMLNode.h
@@ -20,6 +20,7 @@
  * 
  * @APPLE_LICENSE_HEADER_END@
  */
+
 /*     CFXMLNode.h
        Copyright (c) 1998-2009, Apple Inc. All rights reserved.
 */

diff --git a/CFXMLParser.c b/CFXMLParser.c
index 2920da7879a36e903a5361c3e9820b9b7678cc30..f7b44b57803fd183edda4676919f1cdc7bba5448 100644 (file)
--- a/CFXMLParser.c
+++ b/CFXMLParser.c
@@ -20,6 +20,7 @@
  * 
  * @APPLE_LICENSE_HEADER_END@
  */
+
 /*     CFXMLParser.c
        Copyright (c) 1999-2009, Apple Inc. All rights reserved.
        Responsibility: Chris Parker

diff --git a/CFXMLParser.h b/CFXMLParser.h
index ea55ff73029ceaa12e6cd14d88bb218ace28cc4b..73d655e37d81ef239326301c131b6e51a9639e9a 100644 (file)
--- a/CFXMLParser.h
+++ b/CFXMLParser.h
@@ -20,6 +20,7 @@
  * 
  * @APPLE_LICENSE_HEADER_END@
  */
+
 /*     CFXMLParser.h
        Copyright (c) 1998-2009, Apple Inc. All rights reserved.
 */

diff --git a/CFXMLPreferencesDomain.c b/CFXMLPreferencesDomain.c
index 43b52494b0de4fb009ebb53a6cb7ec2d9bcf8862..a3c1a01bcc203b1f66a039b126297a592b894aec 100644 (file)
--- a/CFXMLPreferencesDomain.c
+++ b/CFXMLPreferencesDomain.c
@@ -20,6 +20,7 @@
  * 
  * @APPLE_LICENSE_HEADER_END@
  */
+
 /*     CFXMLPreferencesDomain.c
        Copyright (c) 1998-2009, Apple Inc. All rights reserved.
        Responsibility: Chris Parker

diff --git a/CFXMLTree.c b/CFXMLTree.c
index 36666c94dce053e79a5ef745423733dc10ff6de3..deb74fbb6123b3236700f020646a97e59e525c6c 100644 (file)
--- a/CFXMLTree.c
+++ b/CFXMLTree.c
@@ -20,6 +20,7 @@
  * 
  * @APPLE_LICENSE_HEADER_END@
  */
+
 /*     CFXMLTree.c
        Copyright (c) 1999-2009, Apple Inc. All rights reserved.
        Responsibility: Chris Parker

diff --git a/CoreFoundation.h b/CoreFoundation.h
index 3421db054c455b461ef00e0d8c48a7e143d1bfd2..0449f0fa4b1e960858177b39cbc8c32daaab5432 100644 (file)
--- a/CoreFoundation.h
+++ b/CoreFoundation.h
@@ -20,6 +20,7 @@
  * 
  * @APPLE_LICENSE_HEADER_END@
  */
+
 /*     CoreFoundation.h
        Copyright (c) 1998-2009, Apple Inc. All rights reserved.
 */
@@ -94,6 +95,7 @@
 #if (TARGET_OS_MAC && !(TARGET_OS_EMBEDDED || TARGET_OS_IPHONE)) || (TARGET_OS_EMBEDDED || TARGET_OS_IPHONE)
 #include <CoreFoundation/CFMachPort.h>
 #endif
+
 #if (TARGET_OS_MAC && !(TARGET_OS_EMBEDDED || TARGET_OS_IPHONE))
 #include <CoreFoundation/CFUserNotification.h>
 #include <CoreFoundation/CFXMLNode.h>

diff --git a/CoreFoundation_Prefix.h b/CoreFoundation_Prefix.h
index b879ff3338437261346be43080913088fe2be459..90180492671556e2a8005930bd1cffd934c9cedd 100644 (file)
--- a/CoreFoundation_Prefix.h
+++ b/CoreFoundation_Prefix.h
@@ -20,6 +20,7 @@
  * 
  * @APPLE_LICENSE_HEADER_END@
  */
+
 /*     CoreFoundation_Prefix.h
        Copyright (c) 2005-2009, Apple Inc. All rights reserved.
 */

diff --git a/ForFoundationOnly.h b/ForFoundationOnly.h
index 201c9fc98236ddd0a51115c946e22a8990fee121..028cca1f5432158c439c2d89eb232ede928647f6 100644 (file)
--- a/ForFoundationOnly.h
+++ b/ForFoundationOnly.h
@@ -20,6 +20,7 @@
  * 
  * @APPLE_LICENSE_HEADER_END@
  */
+
 /*     ForFoundationOnly.h
        Copyright (c) 1998-2009, Apple Inc. All rights reserved.
 */

diff --git a/Info.plist b/Info.plist
index fe8b36a35e1ac946149304be2eeec304ca611f32..ab02c7305e26de346a7aa194123b574b798e1505 100644 (file)
--- a/Info.plist
+++ b/Info.plist
@@ -15,11 +15,11 @@
        <key>CFBundlePackageType</key>
        <string>FMWK</string>
        <key>CFBundleShortVersionString</key>
-       <string>6.6</string>
+       <string>6.6.1</string>
        <key>CFBundleSignature</key>
        <string>????</string>
        <key>CFBundleVersion</key>
-       <string>550.1</string>
+       <string>550.13</string>
        <key>CarbonLazyValues</key>
        <dict>
                <key>CodeFragmentManager</key>