Преглед на файлове

Only fallback to -[NSData base64Encoding] on macOS

Pierre-Olivier Latour преди 6 години
родител
ревизия
561f56e7fb
променени са 2 файла, в които са добавени 6 реда и са изтрити 1 реда
  1. 1 0
      GCDWebServer.xcodeproj/project.pbxproj
  2. 5 1
      GCDWebServer/Core/GCDWebServer.m

+ 1 - 0
GCDWebServer.xcodeproj/project.pbxproj

@@ -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
GCDWebServer/Core/GCDWebServer.m

@@ -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