- Merge PR #280, Make tvOS & watchOS checks verify

truthiness as well as definedness, by Felipe Gasper (fixes #279).
NLnetLabs · Aug 4, 2020 · ded7fda · ded7fda
2 parents 764a0dc + 74c1d5b
commit ded7fda
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 3 deletions.
diff --git 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/doc/Changelog b/doc/Changelog
@@ -1,5 +1,7 @@
 4 August 2020: George
 	- Improve error log message when inserting rpz RR.
+	- Merge PR #280, Make tvOS & watchOS checks verify truthiness as well as
+	  definedness, by Felipe Gasper.
 
 4 August 2020: Wouter
 	- Fix mini_event.h on OpenBSD cannot find fd_set.

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