--- tools/ippfind.c	2026-04-28 01:13:21.000000000 +0800
+++ tools/ippfind.c	2026-06-08 21:01:58.000000000 +0800
@@ -33,7 +33,12 @@
 #endif /* HAVE_MDNSRESPONDER */
 
 #ifndef _WIN32
+#ifdef __APPLE__
+#include <crt_externs.h>
+#define environ (*_NSGetEnviron())
+#else
 extern char **environ;			/* Process environment variables */
+#endif
 #endif /* !_WIN32 */
 
 
@@ -1721,10 +1726,10 @@
     case kDNSServiceErr_PollingMode :
         return ("Service polling mode error.");
 
-#ifndef _WIN32
+#if defined kDNSServiceErr_Timeout
     case kDNSServiceErr_Timeout :
         return ("Service timeout.");
-#endif /* !_WIN32 */
+#endif
   }
 
 #  elif defined(HAVE_AVAHI)

--- scheduler/dirsvc.c	2026-04-28 01:13:21.000000000 +0800
+++ scheduler/dirsvc.c	2026-06-08 20:50:30.000000000 +0800
@@ -844,8 +844,10 @@
     case kDNSServiceErr_PollingMode :
         return ("Service polling mode error.");
 
+#  if defined kDNSServiceErr_Timeout
     case kDNSServiceErr_Timeout :
         return ("Service timeout.");
+#  endif
   }
 
 #  else /* HAVE_AVAHI */