Merge pull request swisspol#416 from melle/app-extensions

swisspol · web-flow · commit 8d0a3599ee30 · 2019-03-13T23:32:50.000+09:00
Allow to build and run GDWebServer in app extensions.
diff --git a/GCDWebServer/Core/GCDWebServer.m b/GCDWebServer/Core/GCDWebServer.m
@@ -198,7 +198,7 @@ - (void)dealloc {
 #endif
 }
 
-#if TARGET_OS_IPHONE
+#if TARGET_OS_IPHONE && !defined TARGET_OS_IPHONE_EXTENSION
 
 // Always called on main thread
 - (void)_startBackgroundTask {
@@ -223,7 +223,7 @@ - (void)_didConnect {
   _connected = YES;
   GWS_LOG_DEBUG(@"Did connect");
 
-#if TARGET_OS_IPHONE
+#if TARGET_OS_IPHONE && !defined TARGET_OS_IPHONE_EXTENSION
   if ([[UIApplication sharedApplication] applicationState] != UIApplicationStateBackground) {
     [self _startBackgroundTask];
   }
@@ -253,7 +253,7 @@ - (void)willStartConnection:(GCDWebServerConnection*)connection {
   });
 }
 
-#if TARGET_OS_IPHONE
+#if TARGET_OS_IPHONE && !defined TARGET_OS_IPHONE_EXTENSION
 
 // Always called on main thread
 - (void)_endBackgroundTask {
@@ -277,7 +277,7 @@ - (void)_didDisconnect {
   _connected = NO;
   GWS_LOG_DEBUG(@"Did disconnect");
 
-#if TARGET_OS_IPHONE
+#if TARGET_OS_IPHONE && !defined TARGET_OS_IPHONE_EXTENSION
   [self _endBackgroundTask];
 #endif
 
@@ -726,7 +726,7 @@ - (void)_willEnterForeground:(NSNotification*)notification {
 - (BOOL)startWithOptions:(NSDictionary<NSString*, id>*)options error:(NSError**)error {
   if (_options == nil) {
     _options = options ? [options copy] : @{};
-#if TARGET_OS_IPHONE
+#if TARGET_OS_IPHONE && !defined TARGET_OS_IPHONE_EXTENSION
     _suspendInBackground = [(NSNumber*)_GetOption(_options, GCDWebServerOption_AutomaticallySuspendInBackground, @YES) boolValue];
     if (((_suspendInBackground == NO) || ([[UIApplication sharedApplication] applicationState] != UIApplicationStateBackground)) && ![self _start:error])
 #else
