[trafficserver] branch 9.1.x updated: Refine Inline.cc carveout for arm64 darwin builds (#7662)

[zwoop]

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 43f08cb  Refine Inline.cc carveout for arm64 darwin builds (#7662)
43f08cb is described below

commit 43f08cb343b0cd1741fd238b3ff05ebcb8358580
Author: Randall Meyer <r...@apple.com>
AuthorDate: Wed Mar 31 09:27:55 2021 -0700

    Refine Inline.cc carveout for arm64 darwin builds (#7662)
    
    This allows the macOS release build to complete successfully
    
    (cherry picked from commit 43452ca8da108ccec793c5fb92affa46620820c2)
---
 iocore/aio/Inline.cc         | 2 +-
 iocore/cache/Inline.cc       | 2 +-
 iocore/dns/Inline.cc         | 2 +-
 iocore/eventsystem/Inline.cc | 2 +-
 iocore/hostdb/Inline.cc      | 2 +-
 iocore/net/Inline.cc         | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/iocore/aio/Inline.cc b/iocore/aio/Inline.cc
index 03ba7b0..7979c47 100644
--- a/iocore/aio/Inline.cc
+++ b/iocore/aio/Inline.cc
@@ -26,7 +26,7 @@
  *
  */
 
-#if !defined(darwin)
+#if !(defined(darwin) && defined(__aarch64__))
 #define TS_INLINE
 #include "P_AIO.h"
 #endif
diff --git a/iocore/cache/Inline.cc b/iocore/cache/Inline.cc
index 80b7af8..6b9a4e2 100644
--- a/iocore/cache/Inline.cc
+++ b/iocore/cache/Inline.cc
@@ -26,7 +26,7 @@
  *
  */
 
-#if !defined(darwin)
+#if !(defined(darwin) && defined(__aarch64__))
 #define TS_INLINE
 #include "P_Cache.h"
 #endif
diff --git a/iocore/dns/Inline.cc b/iocore/dns/Inline.cc
index c7142c7..0d06515 100644
--- a/iocore/dns/Inline.cc
+++ b/iocore/dns/Inline.cc
@@ -26,7 +26,7 @@
  *
  */
 
-#if !defined(darwin)
+#if !(defined(darwin) && defined(__aarch64__))
 #define TS_INLINE
 #include "P_DNS.h"
 #endif
diff --git a/iocore/eventsystem/Inline.cc b/iocore/eventsystem/Inline.cc
index 98a80a3..3c55a63 100644
--- a/iocore/eventsystem/Inline.cc
+++ b/iocore/eventsystem/Inline.cc
@@ -26,7 +26,7 @@
  *
  */
 
-#if !defined(darwin)
+#if !(defined(darwin) && defined(__aarch64__))
 #define TS_INLINE
 #include "P_EventSystem.h"
 #endif
diff --git a/iocore/hostdb/Inline.cc b/iocore/hostdb/Inline.cc
index 17cb3fe..3be8524 100644
--- a/iocore/hostdb/Inline.cc
+++ b/iocore/hostdb/Inline.cc
@@ -26,7 +26,7 @@
  *
  */
 
-#if !defined(darwin)
+#if !(defined(darwin) && defined(__aarch64__))
 #define TS_INLINE
 #include "P_HostDB.h"
 #endif
diff --git a/iocore/net/Inline.cc b/iocore/net/Inline.cc
index fe9fe52..f54c7db 100644
--- a/iocore/net/Inline.cc
+++ b/iocore/net/Inline.cc
@@ -26,7 +26,7 @@
  *
  */
 
-#if !defined(darwin)
+#if !(defined(darwin) && defined(__aarch64__))
 #define TS_INLINE
 #include "P_Net.h"
 #endif