Merge pull request #880 from saiHemak/nscalendar

swift-ci · web-flow · commit dc2061214e33 · 2017-02-13T10:36:42.000-08:00
diff --git a/CoreFoundation/Locale.subproj/CFCalendar.c b/CoreFoundation/Locale.subproj/CFCalendar.c
@@ -272,6 +272,7 @@ CFCalendarRef CFCalendarCreateWithIdentifier(CFAllocatorRef allocator, CFStringR
 	else if (CFEqual(kCFIslamicCalendar, identifier)) identifier = kCFIslamicCalendar;
 	else if (CFEqual(kCFIslamicCivilCalendar, identifier)) identifier = kCFIslamicCivilCalendar;
 	else if (CFEqual(kCFHebrewCalendar, identifier)) identifier = kCFHebrewCalendar;
+       else if (CFEqual(kCFISO8601Calendar, identifier)) identifier = kCFISO8601Calendar;
 //	else if (CFEqual(kCFChineseCalendar, identifier)) identifier = kCFChineseCalendar;
 	else return NULL;
     }

Original file line number	Diff line number	Diff line change
`@@ -272,6 +272,7 @@ CFCalendarRef CFCalendarCreateWithIdentifier(CFAllocatorRef allocator, CFStringR`
`272`	`272`	`else if (CFEqual(kCFIslamicCalendar, identifier)) identifier = kCFIslamicCalendar;`
`273`	`273`	`else if (CFEqual(kCFIslamicCivilCalendar, identifier)) identifier = kCFIslamicCivilCalendar;`
`274`	`274`	`else if (CFEqual(kCFHebrewCalendar, identifier)) identifier = kCFHebrewCalendar;`
	`275`	`+ else if (CFEqual(kCFISO8601Calendar, identifier)) identifier = kCFISO8601Calendar;`
`275`	`276`	`// else if (CFEqual(kCFChineseCalendar, identifier)) identifier = kCFChineseCalendar;`
`276`	`277`	`else return NULL;`
`277`	`278`	`}`