From 0eeee7c2871718506a9af3b0afa66e86accd2068 Mon Sep 17 00:00:00 2001 From: Randall Meyer Date: Mon, 14 Dec 2020 20:52:05 -0800 Subject: [PATCH] Disable compiling Inline.cc on macOS Allows builds on Apple Silicon to complete and run --- 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 8e9b6d32c58..03ba7b0549b 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 ecd72d29e19..80b7af87f15 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 27da8cd3665..c7142c7cad5 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 dc708c272ec..98a80a37341 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 1c2c407212c..0fc3518469e 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 dd8fb467659..17cb3fe30d8 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 96716d64515..fe9fe52040c 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 dca7e0ae92e..39f6c113e1c 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"