Make tvOS & watchOS checks verify truthiness as well as definedness.

diff --git a/daemon/unbound.c b/daemon/unbound.c
index 3f96603c43073b1d96975bb9ec06b4154f347743..cd0fd69f2ca48e582a0b6491c2b90de5dcdcc48f 100644 (file)
--- a/daemon/unbound.c
+++ b/daemon/unbound.c
@@ -92,7 +92,7 @@
 #include <TargetConditionals.h>
 #endif
 
-#if defined(TARGET_OS_TV) || defined(TARGET_OS_WATCH)
+#if (defined(TARGET_OS_TV) && TARGET_OS_TV) || (defined(TARGET_OS_WATCH) && TARGET_OS_WATCH)
 #undef HAVE_FORK
 #endif
 

diff --git a/libunbound/libworker.c b/libunbound/libworker.c
index 44b8d790561f286d4b672e5627658f40aa9676a7..bd42462e1be6dc18459afa8f1a487ba504419526 100644 (file)
--- a/libunbound/libworker.c
+++ b/libunbound/libworker.c
@@ -78,7 +78,7 @@
 #include <TargetConditionals.h>
 #endif
 
-#if defined(TARGET_OS_TV) || defined(TARGET_OS_WATCH)
+#if (defined(TARGET_OS_TV) && TARGET_OS_TV) || (defined(TARGET_OS_WATCH) && TARGET_OS_WATCH)
 #undef HAVE_FORK
 #endif
 

diff --git a/smallapp/unbound-control.c b/smallapp/unbound-control.c
index c2b42e951640b40f34aaf5c65970a28f75e1f63e..4662c7cb6158d9a774eda6a46a2bbbf3d714885d 100644 (file)
--- a/smallapp/unbound-control.c
+++ b/smallapp/unbound-control.c
@@ -886,7 +886,7 @@ int main(int argc, char* argv[])
        if(argc == 0)
                usage();
        if(argc >= 1 && strcmp(argv[0], "start")==0) {
-#if defined(TARGET_OS_TV) || defined(TARGET_OS_WATCH)
+#if (defined(TARGET_OS_TV) && TARGET_OS_TV) || (defined(TARGET_OS_WATCH) && TARGET_OS_WATCH)
                fatal_exit("could not exec unbound: %s",
                        strerror(ENOSYS));
 #else