master/coturn
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Simplify defines for macOS platform (#1058)

Browse Source 
`__APPLE__` is enough to detect macOS
This commit is contained in:
Pavel Punsky 2022-10-29 20:16:07 -07:00 committed by GitHub
parent 4995b64453
commit 2716ed035a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 9 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/apps/common/apputils.c
View File

@ -35,8 +35,7 @@
#include <event2/event.h>
#if defined(__unix__) || defined(unix) || defined(__APPLE__) \
|| defined(__DARWIN__) || defined(__MACH__)
#if defined(__unix__) || defined(unix) || defined(__APPLE__)
#include <ifaddrs.h>
#include <getopt.h>
#include <libgen.h>
@ -740,8 +739,7 @@ int handle_socket_error(void) {
* Must close connection.
*/
return 0;
#if defined(__unix__) || defined(unix) || defined(__APPLE__) \
|| defined(__DARWIN__) || defined(__MACH__)
#if defined(__unix__) || defined(unix) || defined(__APPLE__)
case EHOSTDOWN:
/* Host is down.
* Just ignore, might be an attacker

15
src/apps/common/ns_turn_utils.c
View File

@ -163,8 +163,7 @@ static char* str_fac[]={"LOG_AUTH","LOG_CRON","LOG_DAEMON",
"LOG_AUTHPRIV","LOG_SYSLOG",
0};
#if defined(__unix__) || defined(unix) || defined(__APPLE__) \
|| defined(__DARWIN__) || defined(__MACH__)
#if defined(__unix__) || defined(unix) || defined(__APPLE__)
static int int_fac[]={LOG_AUTH , LOG_CRON , LOG_DAEMON ,
LOG_KERN , LOG_LOCAL0 , LOG_LOCAL1 ,
LOG_LOCAL2 , LOG_LOCAL3 , LOG_LOCAL4 , LOG_LOCAL5 ,
@ -190,8 +189,7 @@ void set_syslog_facility(char *val)
if(val == NULL){
return;
}
#if defined(__unix__) || defined(unix) || defined(__APPLE__) \
|| defined(__DARWIN__) || defined(__MACH__)
#if defined(__unix__) || defined(unix) || defined(__APPLE__)
int tmp = str_to_syslog_facility(val);
if(tmp == -1){
TURN_LOG_FUNC(TURN_LOG_LEVEL_WARNING, "WARNING: invalid syslog-facility value (%s); ignored.\n", val);
@ -377,8 +375,7 @@ static void set_log_file_name_func(char *base, char *f, size_t fsz)
static void sighup_callback_handler(int signum)
{
#if defined(__unix__) || defined(unix) || defined(__APPLE__) \
|| defined(__DARWIN__) || defined(__MACH__)
#if defined(__unix__) || defined(unix) || defined(__APPLE__)
if(signum == SIGHUP) {
to_reset_log_file = 1;
}
@ -397,8 +394,7 @@ static void set_rtpfile(void)
return;
} else if (!_rtpfile) {
#if defined(__unix__) || defined(unix) || defined(__APPLE__) \
|| defined(__DARWIN__) || defined(__MACH__)
#if defined(__unix__) || defined(unix) || defined(__APPLE__)
signal(SIGHUP, sighup_callback_handler);
#endif
@ -540,8 +536,7 @@ void rollover_logfile(void)
static int get_syslog_level(TURN_LOG_LEVEL level)
{
#if defined(__unix__) || defined(unix) || defined(__APPLE__) \
|| defined(__DARWIN__) || defined(__MACH__)
#if defined(__unix__) || defined(unix) || defined(__APPLE__)
switch(level) {
case TURN_LOG_LEVEL_CONTROL:
return LOG_NOTICE;

3
src/apps/relay/turn_admin_server.c
View File

@ -39,8 +39,7 @@
#include <unistd.h>
#endif
#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>

3
src/client/ns_turn_ioaddr.c
View File

@ -30,8 +30,7 @@
#include "ns_turn_ioaddr.h"
#if defined(__unix__) || defined(unix) || defined(__APPLE__) \
|| defined(__DARWIN__) || defined(__MACH__)
#if defined(__unix__) || defined(unix) || defined(__APPLE__)
#include <netdb.h>
#endif