From 9761f045b29a116ce993ac9c5fdc14ba133d3ba7 Mon Sep 17 00:00:00 2001 From: Patrick Dinger Date: Wed, 8 Apr 2015 14:44:43 +0200 Subject: [PATCH] Fix calendar deprecation warning on OSX 10.10 --- SSZipArchive/SSZipArchive.m | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/SSZipArchive/SSZipArchive.m b/SSZipArchive/SSZipArchive.m index 5bab3fa..aa9cfa4 100644 --- a/SSZipArchive/SSZipArchive.m +++ b/SSZipArchive/SSZipArchive.m @@ -467,7 +467,7 @@ - (void)zipInfo:(zip_fileinfo*)zipInfo setDate:(NSDate*)date { NSCalendar *currentCalendar = [NSCalendar currentCalendar]; -#ifdef __IPHONE_8_0 +#if defined(__IPHONE_8_0) || defined(__MAC_10_10) uint flags = NSCalendarUnitYear | NSCalendarUnitMonth | NSCalendarUnitDay | NSCalendarUnitHour | NSCalendarUnitMinute | NSCalendarUnitSecond; #else uint flags = NSYearCalendarUnit | NSMonthCalendarUnit | NSDayCalendarUnit | NSHourCalendarUnit | NSMinuteCalendarUnit | NSSecondCalendarUnit; @@ -639,7 +639,7 @@ static NSCalendar *gregorian; static dispatch_once_t onceToken; dispatch_once(&onceToken, ^{ -#ifdef __IPHONE_8_0 +#if defined(__IPHONE_8_0) || defined(__MAC_10_10) gregorian = [[NSCalendar alloc] initWithCalendarIdentifier:NSCalendarIdentifierGregorian]; #else gregorian = [[NSCalendar alloc] initWithCalendarIdentifier:NSGregorianCalendar];