From: Felipe Gasper <felipe@felipegasper.com>
Date: Mon, 3 Aug 2020 18:37:00 +0000 (-0400)
Subject: Make tvOS & watchOS checks verify truthiness as well as definedness.
X-Git-Tag: release-1.12.0rc1~49^2^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9bc30967d29dd13441eca2a003048ee7975181f7;p=thirdparty%2Funbound.git

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

diff --git a/daemon/unbound.c b/daemon/unbound.c
index 3f96603c4..cd0fd69f2 100644
--- 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 44b8d7905..bd42462e1 100644
--- 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 c2b42e951..4662c7cb6 100644
--- 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