From 28b835aedb033ed073ac0cd50f9dc2620f1babb5 Mon Sep 17 00:00:00 2001 From: Apple Date: Thu, 13 Nov 2008 02:38:26 +0000 Subject: [PATCH] CF-476.15.tar.gz --- CFURLAccess.c | 4 +-- ForFoundationOnly.h | 67 --------------------------------------------- 2 files changed, 2 insertions(+), 69 deletions(-) diff --git a/CFURLAccess.c b/CFURLAccess.c index 9f1dc61..e4fe101 100644 --- a/CFURLAccess.c +++ b/CFURLAccess.c @@ -687,9 +687,9 @@ Boolean CFURLCreateDataAndPropertiesFromResource(CFAllocatorRef alloc, CFURLRef 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); - } 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 diff --git a/ForFoundationOnly.h b/ForFoundationOnly.h index f213eb4..4aefa6f 100644 --- a/ForFoundationOnly.h +++ b/ForFoundationOnly.h @@ -164,73 +164,6 @@ CF_EXTERN_C_END #endif -#if DEPLOYMENT_TARGET_MACOSX || 0 || 0 -// ---- CFNotification material ---------------------------------------- - -#include - -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 ---------------------------------------- -- 2.45.2