[core] Use TARGET_OS_MAC instead of TARGET_OS_OSX/IOS/TV (#1658).

Removed usage of OSX, in favor of standard definitions
Haivision · Nov 17, 2020 · b0a9d4d · b0a9d4d
1 parent f6438db
commit b0a9d4d
Show file tree

Hide file tree

Showing 11 changed files with 20 additions and 12 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -555,8 +555,7 @@ if(WIN32)
 	message(STATUS "DETECTED SYSTEM: WINDOWS;  WIN32=1; PTW32_STATIC_LIB=1")
 	add_definitions(-DWIN32=1 -DPTW32_STATIC_LIB=1)
 elseif(DARWIN)
-	message(STATUS "DETECTED SYSTEM: DARWIN;  OSX=1")
-	add_definitions(-DOSX=1)
+	message(STATUS "DETECTED SYSTEM: DARWIN")
 elseif(BSD)
 	message(STATUS "DETECTED SYSTEM: BSD;  BSD=1")
 	add_definitions(-DBSD=1)

diff --git a/srtcore/channel.cpp b/srtcore/channel.cpp
@@ -267,7 +267,7 @@ void CChannel::attach(UDPSOCKET udpsock, const sockaddr_any& udpsocks_addr)
 
 void CChannel::setUDPSockOpt()
 {
-   #if defined(BSD) || defined(OSX) || (TARGET_OS_IOS == 1) || (TARGET_OS_TV == 1)
+   #if defined(BSD) || TARGET_OS_MAC
       // BSD system will fail setsockopt if the requested buffer size exceeds system maximum value
       int maxsize = 64000;
       if (0 != ::setsockopt(m_iSocket, SOL_SOCKET, SO_RCVBUF, (char*)&m_iRcvBufSize, sizeof(int)))
@@ -376,7 +376,7 @@ void CChannel::setUDPSockOpt()
 #else
    timeval tv;
    tv.tv_sec = 0;
-#if defined (BSD) || defined (OSX) || (TARGET_OS_IOS == 1) || (TARGET_OS_TV == 1)
+#if defined (BSD) || TARGET_OS_MAC
    // Known BSD bug as the day I wrote this code.
    // A small time out value will cause the socket to block forever.
    tv.tv_usec = 10000;

diff --git a/srtcore/epoll.cpp b/srtcore/epoll.cpp
@@ -116,7 +116,7 @@ ENOMEM: There was insufficient memory to create the kernel object.
        */
    if (localid < 0)
       throw CUDTException(MJ_SETUP, MN_NONE, errno);
-   #elif defined(BSD) || defined(OSX) || (TARGET_OS_IOS == 1) || (TARGET_OS_TV == 1)
+   #elif defined(BSD) || TARGET_OS_MAC
    localid = kqueue();
    if (localid < 0)
       throw CUDTException(MJ_SETUP, MN_NONE, errno);
@@ -216,7 +216,7 @@ int CEPoll::add_ssock(const int eid, const SYSSOCKET& s, const int* events)
    ev.data.fd = s;
    if (::epoll_ctl(p->second.m_iLocalID, EPOLL_CTL_ADD, s, &ev) < 0)
       throw CUDTException();
-#elif defined(BSD) || defined(OSX) || (TARGET_OS_IOS == 1) || (TARGET_OS_TV == 1)
+#elif defined(BSD) || TARGET_OS_MAC
    struct kevent ke[2];
    int num = 0;
 
@@ -272,7 +272,7 @@ int CEPoll::remove_ssock(const int eid, const SYSSOCKET& s)
    epoll_event ev;  // ev is ignored, for compatibility with old Linux kernel only.
    if (::epoll_ctl(p->second.m_iLocalID, EPOLL_CTL_DEL, s, &ev) < 0)
       throw CUDTException();
-#elif defined(BSD) || defined(OSX) || (TARGET_OS_IOS == 1) || (TARGET_OS_TV == 1)
+#elif defined(BSD) || TARGET_OS_MAC
    struct kevent ke;
 
    //
@@ -391,7 +391,7 @@ int CEPoll::update_ssock(const int eid, const SYSSOCKET& s, const int* events)
    ev.data.fd = s;
    if (::epoll_ctl(p->second.m_iLocalID, EPOLL_CTL_MOD, s, &ev) < 0)
       throw CUDTException();
-#elif defined(BSD) || defined(OSX) || (TARGET_OS_IOS == 1) || (TARGET_OS_TV == 1)
+#elif defined(BSD) || TARGET_OS_MAC
    struct kevent ke[2];
    int num = 0;
 
@@ -628,7 +628,7 @@ int CEPoll::wait(const int eid, set<SRTSOCKET>* readfds, set<SRTSOCKET>* writefd
                 }
                 HLOGC(ealog.Debug, log << "CEPoll::wait: LINUX: picking up " << (total - prev_total)  << " ready fds.");
 
-#elif defined(BSD) || defined(OSX) || (TARGET_OS_IOS == 1) || (TARGET_OS_TV == 1)
+#elif defined(BSD) || TARGET_OS_MAC
                 struct timespec tmout = {0, 0};
                 const int max_events = ed.m_sLocals.size();
                 SRT_ASSERT(max_event > 0);
@@ -819,7 +819,7 @@ int CEPoll::release(const int eid)
    #ifdef LINUX
    // release local/system epoll descriptor
    ::close(i->second.m_iLocalID);
-   #elif defined(BSD) || defined(OSX) || (TARGET_OS_IOS == 1) || (TARGET_OS_TV == 1)
+   #elif defined(BSD) || TARGET_OS_MAC
    ::close(i->second.m_iLocalID);
    #endif
 

diff --git a/srtcore/fec.cpp b/srtcore/fec.cpp
@@ -8,6 +8,7 @@
  * 
  */
 
+#include "platform_sys.h"
 
 #include <string>
 #include <map>

diff --git a/srtcore/group.cpp b/srtcore/group.cpp
@@ -1,3 +1,5 @@
+#include "platform_sys.h"
+
 #include <iterator>
 
 #include "api.h"

diff --git a/srtcore/packetfilter.cpp b/srtcore/packetfilter.cpp
@@ -8,6 +8,7 @@
  * 
  */
 
+#include "platform_sys.h"
 
 #include <string>
 #include <map>

diff --git a/srtcore/platform_sys.h b/srtcore/platform_sys.h
@@ -52,7 +52,6 @@
 #include "TargetConditionals.h"
 #define __APPLE_USE_RFC_3542 /* IPV6_PKTINFO */
 
-
 #ifdef SRT_IMPORT_TIME
       #include <mach/mach_time.h>
 #endif

diff --git a/srtcore/srt_compat.c b/srtcore/srt_compat.c
@@ -16,6 +16,8 @@ written by
 
 // Prevents from misconfiguration through preprocessor.
 
+#include "platform_sys.h"
+
 #include <srt_compat.h>
 
 #include <string.h>

diff --git a/srtcore/sync.cpp b/srtcore/sync.cpp
@@ -7,6 +7,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  *
  */
+#include "platform_sys.h"
 
 #include <iomanip>
 #include <stdexcept>

diff --git a/srtcore/sync_cxx11.cpp b/srtcore/sync_cxx11.cpp
@@ -7,6 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  *
  */
+#include "platform_sys.h"
+
 #include <iomanip>
 #include <math.h>
 #include <stdexcept>

diff --git a/srtcore/sync_posix.cpp b/srtcore/sync_posix.cpp
@@ -7,6 +7,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  *
  */
+#include "platform_sys.h"
 
 #include <iomanip>
 #include <math.h>
@@ -23,7 +24,7 @@
 #define TIMING_USE_QPC
 #include "win/wintime.h"
 #include <sys/timeb.h>
-#elif defined(OSX) || (TARGET_OS_OSX == 1) || (TARGET_OS_IOS == 1) || (TARGET_OS_TV == 1)
+#elif TARGET_OS_MAC
 #define TIMING_USE_MACH_ABS_TIME
 #include <mach/mach_time.h>
 #elif defined(ENABLE_MONOTONIC_CLOCK)
-Original file line number
+Diff line change
@@ Expand Up / @@ -8,6 +8,7 @@ @@
      *
      */
+    #include "platform_sys.h"
     #include <string>
     #include <map>
@@ Expand Down @@