From 17fad0f1b9b5aada600f07633534818875d34291 Mon Sep 17 00:00:00 2001 From: Pierre-Olivier Latour Date: Sun, 24 Aug 2014 12:24:16 -0700 Subject: [PATCH] Improved automatic detection of when to use dispatch_retain() and dispatch_release() depending on compiler settings --- GCDWebServer/Core/GCDWebServerPrivate.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/GCDWebServer/Core/GCDWebServerPrivate.h b/GCDWebServer/Core/GCDWebServerPrivate.h index 73b0697..2db33f9 100644 --- a/GCDWebServer/Core/GCDWebServerPrivate.h +++ b/GCDWebServer/Core/GCDWebServerPrivate.h @@ -25,8 +25,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#import -#import +#import #if __has_feature(objc_arc) #define ARC_BRIDGE __bridge @@ -35,7 +34,7 @@ #define ARC_RELEASE(__OBJECT__) #define ARC_AUTORELEASE(__OBJECT__) __OBJECT__ #define ARC_DEALLOC(__OBJECT__) -#if (TARGET_OS_IPHONE && (__IPHONE_OS_VERSION_MIN_REQUIRED >= __IPHONE_6_0)) || (!TARGET_OS_IPHONE && (__MAC_OS_X_VERSION_MIN_REQUIRED >= __MAC_10_8)) +#if OS_OBJECT_USE_OBJC_RETAIN_RELEASE #define ARC_DISPATCH_RETAIN(__OBJECT__) #define ARC_DISPATCH_RELEASE(__OBJECT__) #else