From c062d5e2afc6dc10ff263da10be3ac83e5ff1bfc Mon Sep 17 00:00:00 2001
From: Pavel Punsky <eakraly@users.noreply.github.com>
Date: Mon, 15 Jan 2024 15:18:35 -0800
Subject: [PATCH] Simplify macOS detection macros (#1372)

---
 src/apps/common/ns_turn_utils.c       | 2 +-
 src/apps/relay/dbdrivers/dbd_sqlite.c | 4 ++--
 src/apps/relay/mainrelay.h            | 2 +-
 src/ns_turn_defs.h                    | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/apps/common/ns_turn_utils.c b/src/apps/common/ns_turn_utils.c
index 8d14c5be..4bc80e12 100644
--- a/src/apps/common/ns_turn_utils.c
+++ b/src/apps/common/ns_turn_utils.c
@@ -38,7 +38,7 @@
 
 #include <pthread.h>
 
-#if defined(__unix__) || defined(unix) || defined(__APPLE__) || defined(__DARWIN__) || defined(__MACH__)
+#if defined(__unix__) || defined(unix) || defined(__APPLE__)
 #include <syslog.h>
 #endif
 
diff --git a/src/apps/relay/dbdrivers/dbd_sqlite.c b/src/apps/relay/dbdrivers/dbd_sqlite.c
index a6a48310..e76e8730 100644
--- a/src/apps/relay/dbdrivers/dbd_sqlite.c
+++ b/src/apps/relay/dbdrivers/dbd_sqlite.c
@@ -36,7 +36,7 @@
 
 #include <sqlite3.h>
 
-#if defined(__unix__) || defined(unix) || defined(__APPLE__) || defined(__DARWIN__) || defined(__MACH__)
+#if defined(__unix__) || defined(unix) || defined(__APPLE__)
 #include <pwd.h>
 #include <sys/types.h>
 #include <unistd.h>
@@ -149,7 +149,7 @@ static void fix_user_directory(char *dir0) {
   char *dir = dir0;
   while (*dir == ' ')
     ++dir;
-#if defined(__unix__) || defined(unix) || defined(__APPLE__) || defined(__DARWIN__) || defined(__MACH__)
+#if defined(__unix__) || defined(unix) || defined(__APPLE__)
   if (*dir == '~') {
     char *home = getenv("HOME");
     if (!home) {
diff --git a/src/apps/relay/mainrelay.h b/src/apps/relay/mainrelay.h
index 98b90135..f08e1c67 100644
--- a/src/apps/relay/mainrelay.h
+++ b/src/apps/relay/mainrelay.h
@@ -49,7 +49,7 @@
 
 #include <getopt.h>
 
-#if defined(__unix__) || defined(unix) || defined(__APPLE__) || defined(__DARWIN__) || defined(__MACH__)
+#if defined(__unix__) || defined(unix) || defined(__APPLE__)
 #include <ifaddrs.h>
 #include <libgen.h>
 #include <sys/resource.h>
diff --git a/src/ns_turn_defs.h b/src/ns_turn_defs.h
index 0f92807f..44d4dd6e 100644
--- a/src/ns_turn_defs.h
+++ b/src/ns_turn_defs.h
@@ -42,7 +42,7 @@
 #include <sys/param.h>
 #endif
 
-#if defined(__APPLE__) || defined(__DARWIN__) || defined(__MACH__)
+#if defined(__APPLE__)
 #define __APPLE_USE_RFC_3542
 #endif