CF-476.15.tar.gz

diff --git a/CFURLAccess.c b/CFURLAccess.c
index 9f1dc61bd4a51ddfc469db2b5555d15d39d548c7..e4fe10156d8927b8e8fd92d76c69ce8f99fd3ca6 100644 (file)
--- a/CFURLAccess.c
+++ b/CFURLAccess.c
@@ -687,9 +687,9 @@ Boolean CFURLCreateDataAndPropertiesFromResource(CFAllocatorRef alloc, CFURLRef
         return false;
     } else {
         Boolean result;
         return false;
     } else {
         Boolean result;

-        if (CFStringCompare(scheme, CFSTR("file"), 0) == kCFCompareEqualTo) {
+        if (CFStringCompare(scheme, CFSTR("file"), kCFCompareCaseInsensitive) == kCFCompareEqualTo) {

             result = _CFFileURLCreateDataAndPropertiesFromResource(alloc, url, fetchedData, desiredProperties, fetchedProperties, errorCode);
             result = _CFFileURLCreateDataAndPropertiesFromResource(alloc, url, fetchedData, desiredProperties, fetchedProperties, errorCode);

-        } else if (CFStringCompare(scheme, CFSTR("data"), 0) == kCFCompareEqualTo) {
+        } else if (CFStringCompare(scheme, CFSTR("data"), kCFCompareCaseInsensitive) == kCFCompareEqualTo) {

                        result = _CFDataURLCreateDataAndPropertiesFromResource(alloc, url, fetchedData, desiredProperties, fetchedProperties, errorCode);
                } else {
 #if DEPLOYMENT_TARGET_MACOSX
                        result = _CFDataURLCreateDataAndPropertiesFromResource(alloc, url, fetchedData, desiredProperties, fetchedProperties, errorCode);
                } else {
 #if DEPLOYMENT_TARGET_MACOSX

diff --git a/ForFoundationOnly.h b/ForFoundationOnly.h
index f213eb4445d12808bccc5f3fa86cd877afb7e875..4aefa6f853197d3f04a9ca10b0732f63229e61fe 100644 (file)
--- a/ForFoundationOnly.h
+++ b/ForFoundationOnly.h
@@ -164,73 +164,6 @@ CF_EXTERN_C_END
 
 #endif
 
 
 #endif
 

-#if DEPLOYMENT_TARGET_MACOSX || 0 || 0
-// ---- CFNotification material ----------------------------------------
-
-#include <CoreFoundation/CFNotificationCenter.h>
-
-CF_EXTERN_C_BEGIN
-
-enum {
-    kCFXNotificationSuspensionBehaviorDeliverImmediately = 1,
-    kCFXNotificationSuspensionBehaviorDrop = 2,
-    kCFXNotificationSuspensionBehaviorCoalesce = 4,
-    kCFXNotificationSuspensionBehaviorHold = 8,
-    kCFXNotificationSuspensionBehaviorAny = 0x0000FFFF
-};
-typedef CFOptionFlags CFXNotificationSuspensionBehavior;
-
-CF_EXPORT const CFStringRef kCFNotificationAnyName;
-CF_EXPORT const CFStringRef kCFNotificationAnyObject;
-
-typedef void (*CFXNotificationCallBack)(CFNotificationCenterRef nc, CFStringRef name, const void *object, CFDictionaryRef userInfo, void *info);
-
-// operations: 1==retain, 2==release, 3==copyDescription
-typedef void *         (*CFXNotificationInfoCallBack)(int operation, void *info);
-typedef bool           (*CFXNotificationEqualCallBack)(const void *info1, const void *info2);
-
-// 'object' is treated as an arbitrary unretained pointer for a local notification
-// center, and as a retained CFStringRef or NULL for a distributed notification center.
-typedef struct {                               // version 0
-    CFIndex                                    version;
-    CFXNotificationCallBack                    callback;
-    CFXNotificationSuspensionBehavior          behavior;
-    CFStringRef                                        name;
-    const void *                               object;
-    void *                                     info;
-    CFXNotificationInfoCallBack                        info_callback;
-} CFNotificationRegistrationData;
-
-typedef struct {                               // version 0
-    CFIndex                                    version;
-    CFXNotificationCallBack                    callback;
-    CFXNotificationSuspensionBehavior          behaviorFlags;
-    CFStringRef                                        name;
-    const void *                               object;
-    void *                                     info;
-    CFXNotificationEqualCallBack               info_equal;
-} CFNotificationUnregistrationData;
-
-
-CF_EXPORT CFNotificationCenterRef _CFXNotificationGetTaskCenter(void);
-CF_EXPORT CFNotificationCenterRef _CFXNotificationGetHostCenter(void);
-
-CF_EXPORT CFNotificationCenterRef _CFXNotificationCenterCreate(CFAllocatorRef allocator, bool distributed);
-
-CF_EXPORT void _CFXNotificationRegister(CFNotificationCenterRef nc, CFNotificationRegistrationData *data);
-CF_EXPORT void _CFXNotificationUnregister(CFNotificationCenterRef nc, CFNotificationUnregistrationData *data);
-
-CF_EXPORT void _CFXNotificationPost(CFNotificationCenterRef nc, CFStringRef name, const void *object, CFDictionaryRef userInfo, CFOptionFlags options);
-CF_EXPORT void _CFXNotificationPostNotification(CFNotificationCenterRef nc, CFStringRef name, const void *object, CFDictionaryRef userInfo, CFOptionFlags options, void *note);
-
-CF_EXPORT bool _CFXNotificationGetSuspended(CFNotificationCenterRef nc);
-CF_EXPORT void _CFXNotificationSetSuspended(CFNotificationCenterRef nc, bool suspended);
-
-CF_EXTERN_C_END
-
-#endif
-
-

 // ---- CFString material ----------------------------------------
 
 
 // ---- CFString material ----------------------------------------