[trafficserver] branch 9.0.x updated: Revert "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.0.x
in repository https://gitbox.apache.org/repos/asf/trafficserver.git


The following commit(s) were added to refs/heads/9.0.x by this push:
     new 423c888  Revert "Disable compiling Inline.cc on macOS (#7389)"
423c888 is described below

commit 423c8883ed004b516a0598b0124563c937de29c0
Author: Leif Hedstrom <zw...@apache.org>
AuthorDate: Tue Mar 9 10:03:48 2021 -0700

    Revert "Disable compiling Inline.cc on macOS (#7389)"
    
    This reverts commit bc41ebdf6fbcb941ab904608ffcaf4b126f10e3b.
    
    This PR breaks builds on regular (Intel) Mac's.
---
 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 deletions(-)

diff --git a/iocore/aio/Inline.cc b/iocore/aio/Inline.cc
index 03ba7b0..8e9b6d3 100644
--- a/iocore/aio/Inline.cc
+++ b/iocore/aio/Inline.cc
@@ -26,7 +26,5 @@
  *
  */
 
-#if !defined(darwin)
 #define TS_INLINE
 #include "P_AIO.h"
-#endif
diff --git a/iocore/cache/Inline.cc b/iocore/cache/Inline.cc
index 80b7af8..ecd72d2 100644
--- a/iocore/cache/Inline.cc
+++ b/iocore/cache/Inline.cc
@@ -26,7 +26,5 @@
  *
  */
 
-#if !defined(darwin)
 #define TS_INLINE
 #include "P_Cache.h"
-#endif
diff --git a/iocore/dns/Inline.cc b/iocore/dns/Inline.cc
index c7142c7..27da8cd 100644
--- a/iocore/dns/Inline.cc
+++ b/iocore/dns/Inline.cc
@@ -26,7 +26,5 @@
  *
  */
 
-#if !defined(darwin)
 #define TS_INLINE
 #include "P_DNS.h"
-#endif
diff --git a/iocore/eventsystem/Inline.cc b/iocore/eventsystem/Inline.cc
index 98a80a3..dc708c2 100644
--- a/iocore/eventsystem/Inline.cc
+++ b/iocore/eventsystem/Inline.cc
@@ -26,7 +26,5 @@
  *
  */
 
-#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 0fc3518..1c2c407 100644
--- a/iocore/eventsystem/unit_tests/test_IOBuffer.cc
+++ b/iocore/eventsystem/unit_tests/test_IOBuffer.cc
@@ -28,9 +28,6 @@
 
 #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 17cb3fe..dd8fb46 100644
--- a/iocore/hostdb/Inline.cc
+++ b/iocore/hostdb/Inline.cc
@@ -26,7 +26,5 @@
  *
  */
 
-#if !defined(darwin)
 #define TS_INLINE
 #include "P_HostDB.h"
-#endif
diff --git a/iocore/net/Inline.cc b/iocore/net/Inline.cc
index fe9fe52..96716d6 100644
--- a/iocore/net/Inline.cc
+++ b/iocore/net/Inline.cc
@@ -26,7 +26,5 @@
  *
  */
 
-#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 c09167c..9f50efe 100644
--- a/iocore/net/test_I_UDPNet.cc
+++ b/iocore/net/test_I_UDPNet.cc
@@ -31,13 +31,8 @@
 #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"