[trafficserver] branch 9.1.x updated: Disable compiling Inline.cc on macOS (#7389)

[zw...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

zwoop pushed a commit to branch 9.1.x
in repository https://gitbox.apache.org/repos/asf/trafficserver.git


The following commit(s) were added to refs/heads/9.1.x by this push:
     new 249b66a  Disable compiling Inline.cc on macOS (#7389)
249b66a is described below

commit 249b66ae31df247b9a9666994c41ff29542faeb4
Author: Randall Meyer <rr...@apache.org>
AuthorDate: Tue Feb 16 12:27:57 2021 -0800

    Disable compiling Inline.cc on macOS (#7389)
    
    Allows builds on Apple Silicon to complete and run
    
    (cherry picked from commit fa8b3f9a3081e6f51d4ae733c48348b9f988e7c8)
---
 iocore/aio/Inline.cc                           | 2 ++
 iocore/cache/Inline.cc                         | 2 ++
 iocore/dns/Inline.cc                           | 2 ++
 iocore/eventsystem/Inline.cc                   | 2 ++
 iocore/eventsystem/unit_tests/test_IOBuffer.cc | 3 +++
 iocore/hostdb/Inline.cc                        | 2 ++
 iocore/net/Inline.cc                           | 2 ++
 iocore/net/test_I_UDPNet.cc                    | 5 +++++
 8 files changed, 20 insertions(+)

diff --git a/iocore/aio/Inline.cc b/iocore/aio/Inline.cc
index 8e9b6d3..03ba7b0 100644
--- a/iocore/aio/Inline.cc
+++ b/iocore/aio/Inline.cc
@@ -26,5 +26,7 @@
  *
  */
 
+#if !defined(darwin)
 #define TS_INLINE
 #include "P_AIO.h"
+#endif
diff --git a/iocore/cache/Inline.cc b/iocore/cache/Inline.cc
index ecd72d2..80b7af8 100644
--- a/iocore/cache/Inline.cc
+++ b/iocore/cache/Inline.cc
@@ -26,5 +26,7 @@
  *
  */
 
+#if !defined(darwin)
 #define TS_INLINE
 #include "P_Cache.h"
+#endif
diff --git a/iocore/dns/Inline.cc b/iocore/dns/Inline.cc
index 27da8cd..c7142c7 100644
--- a/iocore/dns/Inline.cc
+++ b/iocore/dns/Inline.cc
@@ -26,5 +26,7 @@
  *
  */
 
+#if !defined(darwin)
 #define TS_INLINE
 #include "P_DNS.h"
+#endif
diff --git a/iocore/eventsystem/Inline.cc b/iocore/eventsystem/Inline.cc
index dc708c2..98a80a3 100644
--- a/iocore/eventsystem/Inline.cc
+++ b/iocore/eventsystem/Inline.cc
@@ -26,5 +26,7 @@
  *
  */
 
+#if !defined(darwin)
 #define TS_INLINE
 #include "P_EventSystem.h"
+#endif
diff --git a/iocore/eventsystem/unit_tests/test_IOBuffer.cc b/iocore/eventsystem/unit_tests/test_IOBuffer.cc
index 1c2c407..0fc3518 100644
--- a/iocore/eventsystem/unit_tests/test_IOBuffer.cc
+++ b/iocore/eventsystem/unit_tests/test_IOBuffer.cc
@@ -28,6 +28,9 @@
 
 #include "I_EventSystem.h"
 #include "RecordsConfig.h"
+#if defined(darwin)
+#include "P_IOBuffer.h"
+#endif
 
 #include "diags.i"
 
diff --git a/iocore/hostdb/Inline.cc b/iocore/hostdb/Inline.cc
index dd8fb46..17cb3fe 100644
--- a/iocore/hostdb/Inline.cc
+++ b/iocore/hostdb/Inline.cc
@@ -26,5 +26,7 @@
  *
  */
 
+#if !defined(darwin)
 #define TS_INLINE
 #include "P_HostDB.h"
+#endif
diff --git a/iocore/net/Inline.cc b/iocore/net/Inline.cc
index 96716d6..fe9fe52 100644
--- a/iocore/net/Inline.cc
+++ b/iocore/net/Inline.cc
@@ -26,5 +26,7 @@
  *
  */
 
+#if !defined(darwin)
 #define TS_INLINE
 #include "P_Net.h"
+#endif
diff --git a/iocore/net/test_I_UDPNet.cc b/iocore/net/test_I_UDPNet.cc
index dca7e0a..39f6c11 100644
--- a/iocore/net/test_I_UDPNet.cc
+++ b/iocore/net/test_I_UDPNet.cc
@@ -31,8 +31,13 @@
 #include "I_EventSystem.h"
 #include "I_Net.h"
 #include "I_UDPNet.h"
+#if defined(darwin)
+#include "P_UDPConnection.h"
+#include "P_UDPPacket.h"
+#else
 #include "I_UDPPacket.h"
 #include "I_UDPConnection.h"
+#endif
 
 #include "diags.i"