From f51513db45367854a3c4124c15cbca1e7d2dc45a Mon Sep 17 00:00:00 2001 From: twinaphex Date: Wed, 22 Oct 2014 00:38:30 +0200 Subject: [PATCH] (OSX 10.6) Compatibility patches to CFExtensions.m --- apple/common/CFExtensions.m | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/apple/common/CFExtensions.m b/apple/common/CFExtensions.m index d96284e847..fa7b001300 100644 --- a/apple/common/CFExtensions.m +++ b/apple/common/CFExtensions.m @@ -18,13 +18,18 @@ #import #include "CFExtensions.h" +static CFTypeRef BRIDGING_RETAIN(id X) +{ + return X ? CFRetain((CFTypeRef)X) : NULL; +} + void CFSearchPathForDirectoriesInDomains(unsigned flags, unsigned domain_mask, unsigned expand_tilde, char *buf, size_t sizeof_buf) { - CFArrayRef array = CFBridgingRetain(NSSearchPathForDirectoriesInDomains( + CFArrayRef array = BRIDGING_RETAIN(NSSearchPathForDirectoriesInDomains( flags, domain_mask, (BOOL)expand_tilde)); - CFStringRef path = CFBridgingRetain(CFArrayGetValueAtIndex(array, 0)); + CFStringRef path = BRIDGING_RETAIN((id)CFArrayGetValueAtIndex(array, 0)); CFStringGetCString(path, buf, sizeof_buf, kCFStringEncodingUTF8); CFRelease(path); CFRelease(array);