hostip: fix broken macOS/CMake/GCC builds

Follow-up to 31f631a142d855f06

Fixes #7128
Closes #7129

diff --git a/lib/hostip.c b/lib/hostip.c
index 055c190d1cdc430c2fd8610e5b961a0bf2215865..e0e3cfc2cbdef9f6d61d11c80c0ec3ade1067c33 100644 (file)
--- a/lib/hostip.c
+++ b/lib/hostip.c
@@ -69,7 +69,7 @@
 #include "memdebug.h"
 
 #if defined(ENABLE_IPV6) && defined(CURL_OSX_CALL_COPYPROXIES)
-#include <SystemConfiguration/SystemConfiguration.h>
+#include <SystemConfiguration/SCDynamicStoreCopySpecific.h>
 #endif
 
 #if defined(CURLRES_SYNCH) && \

diff --git a/lib/timeval.c b/lib/timeval.c
index 8523dad4009970b7328a1dd2814047d1a98b05ca..698651976be90b379800eef8fdf351b2447170b3 100644 (file)
--- a/lib/timeval.c
+++ b/lib/timeval.c
@@ -78,14 +78,16 @@ struct curltime Curl_now(void)
   ** code compiles but fails during run-time if clock_gettime() is
   ** called on unsupported OS version.
   */
-#if defined(__APPLE__) && (HAVE_BUILTIN_AVAILABLE == 1)
+#if defined(__APPLE__) && defined(HAVE_BUILTIN_AVAILABLE) && \
+        (HAVE_BUILTIN_AVAILABLE == 1)
   bool have_clock_gettime = FALSE;
   if(__builtin_available(macOS 10.12, iOS 10, tvOS 10, watchOS 3, *))
     have_clock_gettime = TRUE;
 #endif
 
   if(
-#if defined(__APPLE__) && (HAVE_BUILTIN_AVAILABLE == 1)
+#if defined(__APPLE__) && defined(HAVE_BUILTIN_AVAILABLE) && \
+        (HAVE_BUILTIN_AVAILABLE == 1)
     have_clock_gettime &&
 #endif
     (0 == clock_gettime(CLOCK_MONOTONIC, &tsnow))) {