Explorar o código

Simplify macOS detection macros (#1372)

Pavel Punsky hai 1 ano
pai
achega
c062d5e2af

+ 1 - 1
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
 

+ 2 - 2
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) {

+ 1 - 1
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>

+ 1 - 1
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