Only fallback to -[NSData base64Encoding] on macOS

This commit is contained in:
Pierre-Olivier Latour
2019-01-03 17:30:21 -08:00
parent e9fdd19830
commit 561f56e7fb
2 changed files with 6 additions and 1 deletions
+1
View File
@@ -1224,6 +1224,7 @@
"-Wshadow",
"-Wshorten-64-to-32",
"-Wstrict-prototypes",
"-Wdeprecated-declarations",
"-Wno-vla",
"-Wno-explicit-ownership-type",
"-Wno-gnu-statement-expression",
+5 -1
View File
@@ -415,10 +415,14 @@ static inline id _GetOption(NSDictionary<NSString*, id>* options, NSString* key,
static inline NSString* _EncodeBase64(NSString* string) {
NSData* data = [string dataUsingEncoding:NSUTF8StringEncoding];
if (@available(macOS 10.9, iOS 7.0, tvOS 9.0, *)) {
#if TARGET_OS_IPHONE
return [[NSString alloc] initWithData:[data base64EncodedDataWithOptions:0] encoding:NSASCIIStringEncoding];
#else
if (@available(macOS 10.9, *)) {
return [[NSString alloc] initWithData:[data base64EncodedDataWithOptions:0] encoding:NSASCIIStringEncoding];
}
return [data base64Encoding];
#endif
}
- (int)_createListeningSocket:(BOOL)useIPv6