You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by zw...@apache.org on 2017/02/23 22:01:47 UTC
[trafficserver] branch master updated: Removes some unnecessary
dependencies on the public ts/ts.h
This is an automated email from the ASF dual-hosted git repository.
zwoop pushed a commit to branch master
in repository https://git-dual.apache.org/repos/asf/trafficserver.git
The following commit(s) were added to refs/heads/master by this push:
new 9a81c97 Removes some unnecessary dependencies on the public ts/ts.h
9a81c97 is described below
commit 9a81c978a17de2eb26fd39a70eb19a8d24f68ab4
Author: Leif Hedstrom <zw...@apache.org>
AuthorDate: Thu Feb 16 16:30:40 2017 -0700
Removes some unnecessary dependencies on the public ts/ts.h
This also removes the proxy/api/ts directory from all default
search paths, to make it more difficult to introduce more bad
includes. There are still a few places that must have the public
APIs, and a few that does but shouldn't. This is a step right
direction at least.
---
cmd/traffic_layout/traffic_layout.cc | 2 +-
iocore/aio/Makefile.am | 2 --
iocore/cache/CachePages.cc | 1 -
iocore/cache/CacheTest.cc | 1 -
iocore/cache/Makefile.am | 1 -
iocore/cluster/Makefile.am | 1 -
iocore/eventsystem/Makefile.am | 2 --
iocore/hostdb/Makefile.am | 2 --
iocore/net/Makefile.am | 1 -
lib/records/I_RecCore.h | 4 ++++
lib/records/RecCore.cc | 9 +++++++++
lib/wccp/Makefile.am | 2 +-
lib/wccp/WccpMsg.cc | 2 +-
mgmt/Makefile.am | 1 -
plugins/experimental/memcache/Makefile.inc | 2 +-
plugins/experimental/memcache/tsmemcache.h | 2 +-
proxy/FetchSM.cc | 1 +
proxy/FetchSM.h | 1 -
proxy/InkAPI.cc | 8 +++++---
proxy/InkAPIInternal.h | 6 +++---
proxy/InkIOCoreAPI.cc | 1 +
proxy/Main.cc | 2 ++
proxy/Makefile.am | 1 -
proxy/ParentSelection.cc | 8 ++++----
proxy/Plugin.cc | 3 +--
proxy/ProxyClientSession.h | 8 ++++++--
proxy/api/ts/InkAPIPrivateIOCore.h | 1 -
proxy/http/HttpDebugNames.h | 1 -
proxy/http/Makefile.am | 1 -
proxy/http/remap/Makefile.am | 1 -
proxy/http/remap/RemapConfig.cc | 4 ++--
proxy/http/remap/RemapPluginInfo.h | 3 ++-
proxy/http/remap/RemapPlugins.h | 2 --
proxy/http2/Makefile.am | 1 -
proxy/logging/Makefile.am | 1 -
proxy/shared/Makefile.am | 1 -
36 files changed, 45 insertions(+), 45 deletions(-)
diff --git a/cmd/traffic_layout/traffic_layout.cc b/cmd/traffic_layout/traffic_layout.cc
index 4320bcf..7f92a07 100644
--- a/cmd/traffic_layout/traffic_layout.cc
+++ b/cmd/traffic_layout/traffic_layout.cc
@@ -160,7 +160,7 @@ produce_layout(bool json)
print_var("LIBDIR", Layout::get()->libdir, json, false); // Don't free this
print_var("LOGDIR", RecConfigReadLogDir(), json);
print_var("RUNTIMEDIR", RecConfigReadRuntimeDir(), json);
- print_var("PLUGINDIR", RecConfigReadPrefixPath("proxy.config.plugin.plugin_dir"), json);
+ print_var("PLUGINDIR", RecConfigReadPluginDir(), json);
print_var("INCLUDEDIR", Layout::get()->includedir, json, false); // Dont' free this
print_var("SNAPSHOTDIR", RecConfigReadSnapshotDir(), json);
diff --git a/iocore/aio/Makefile.am b/iocore/aio/Makefile.am
index aa1e954..4fb24d9 100644
--- a/iocore/aio/Makefile.am
+++ b/iocore/aio/Makefile.am
@@ -42,8 +42,6 @@ test_AIO_SOURCES = \
test_AIO_CPPFLAGS = \
$(AM_CPPFLAGS) \
$(iocore_include_dirs) \
- -I$(abs_top_srcdir)/proxy/api/ts \
- -I$(abs_top_srcdir)/proxy/api \
-I$(abs_top_srcdir)/proxy \
-I$(abs_top_srcdir)/proxy/hdrs \
-I$(abs_top_srcdir)/proxy/http \
diff --git a/iocore/cache/CachePages.cc b/iocore/cache/CachePages.cc
index 74aef25..42f6721 100644
--- a/iocore/cache/CachePages.cc
+++ b/iocore/cache/CachePages.cc
@@ -23,7 +23,6 @@
#include "P_Cache.h"
-#include "api/ts/ts.h"
#include "Show.h"
#include "I_Tasks.h"
#include "CacheControl.h"
diff --git a/iocore/cache/CacheTest.cc b/iocore/cache/CacheTest.cc
index 67bf496..013975d 100644
--- a/iocore/cache/CacheTest.cc
+++ b/iocore/cache/CacheTest.cc
@@ -24,7 +24,6 @@
#include "P_Cache.h"
#include "P_CacheTest.h"
-#include "api/ts/ts.h"
#include <vector>
using namespace std;
diff --git a/iocore/cache/Makefile.am b/iocore/cache/Makefile.am
index 125f589..5f11cee 100644
--- a/iocore/cache/Makefile.am
+++ b/iocore/cache/Makefile.am
@@ -20,7 +20,6 @@ AM_CPPFLAGS = \
$(iocore_include_dirs) \
-I$(abs_top_srcdir)/lib \
-I$(abs_top_srcdir)/lib/records \
- -I$(abs_top_srcdir)/proxy/api/ts \
-I$(abs_top_srcdir)/proxy \
-I$(abs_top_srcdir)/proxy/hdrs \
-I$(abs_top_srcdir)/proxy/http \
diff --git a/iocore/cluster/Makefile.am b/iocore/cluster/Makefile.am
index 86d07c3..87ff1d4 100644
--- a/iocore/cluster/Makefile.am
+++ b/iocore/cluster/Makefile.am
@@ -22,7 +22,6 @@ AM_CPPFLAGS = \
-I$(abs_top_srcdir)/lib/records \
-I$(abs_top_srcdir)/proxy/http \
-I$(abs_top_srcdir)/proxy/hdrs \
- -I$(abs_top_srcdir)/proxy/api/ts \
-I$(abs_top_srcdir)/proxy \
-I$(abs_top_srcdir)/mgmt \
-I$(abs_top_srcdir)/mgmt/utils
diff --git a/iocore/eventsystem/Makefile.am b/iocore/eventsystem/Makefile.am
index 1196a2c..f5bf276 100644
--- a/iocore/eventsystem/Makefile.am
+++ b/iocore/eventsystem/Makefile.am
@@ -77,8 +77,6 @@ test_LD_FLAGS = \
test_CPP_FLAGS = \
$(AM_CPPFLAGS) \
$(iocore_include_dirs) \
- -I$(abs_top_srcdir)/proxy/api/ts \
- -I$(abs_top_srcdir)/proxy/api \
-I$(abs_top_srcdir)/proxy \
-I$(abs_top_srcdir)/proxy/hdrs \
-I$(abs_top_srcdir)/proxy/http \
diff --git a/iocore/hostdb/Makefile.am b/iocore/hostdb/Makefile.am
index e00ef0b..42dddd1 100644
--- a/iocore/hostdb/Makefile.am
+++ b/iocore/hostdb/Makefile.am
@@ -58,8 +58,6 @@ test_LD_FLAGS = \
test_CPP_FLAGS = \
$(AM_CPPFLAGS) \
$(iocore_include_dirs) \
- -I$(abs_top_srcdir)/proxy/api/ts \
- -I$(abs_top_srcdir)/proxy/api \
-I$(abs_top_srcdir)/proxy \
-I$(abs_top_srcdir)/proxy/hdrs \
-I$(abs_top_srcdir)/proxy/http \
diff --git a/iocore/net/Makefile.am b/iocore/net/Makefile.am
index 2ba2bcf..73059e1 100644
--- a/iocore/net/Makefile.am
+++ b/iocore/net/Makefile.am
@@ -26,7 +26,6 @@ AM_CPPFLAGS = \
-I$(abs_top_srcdir)/proxy/logging \
-I$(abs_top_srcdir)/mgmt \
-I$(abs_top_srcdir)/mgmt/utils \
- -I$(abs_top_srcdir)/proxy/api/ts \
-I$(abs_top_srcdir)/proxy/http \
@OPENSSL_INCLUDES@
diff --git a/lib/records/I_RecCore.h b/lib/records/I_RecCore.h
index 52d8d48..da904c7 100644
--- a/lib/records/I_RecCore.h
+++ b/lib/records/I_RecCore.h
@@ -68,6 +68,10 @@ char *RecConfigReadLogDir();
// release the result with ats_free().
char *RecConfigReadBinDir();
+// Return a copy of the system's plugin directory, taking proxy.config.plugin.plugin_dir into account. The caller MUST
+// release the result with ats_free().
+char *RecConfigReadPluginDir();
+
// Return a copy of a configuration file that is relative to sysconfdir. The relative path to the configuration
// file is specified in the configuration variable named by "file_variable". If the configuration variable has no
// value, nullptr is returned. The caller MUST release the result with ats_free().
diff --git a/lib/records/RecCore.cc b/lib/records/RecCore.cc
index befffc3..535f5cc 100644
--- a/lib/records/RecCore.cc
+++ b/lib/records/RecCore.cc
@@ -1194,6 +1194,15 @@ RecConfigReadBinDir()
}
//-------------------------------------------------------------------------
+// RecConfigReadPluginDir
+//-------------------------------------------------------------------------
+char *
+RecConfigReadPluginDir()
+{
+ return RecConfigReadPrefixPath("proxy.config.plugin.plugin_dir");
+}
+
+//-------------------------------------------------------------------------
// RecConfigReadSnapshotDir.
//-------------------------------------------------------------------------
char *
diff --git a/lib/wccp/Makefile.am b/lib/wccp/Makefile.am
index 8896ce5..783ab48 100644
--- a/lib/wccp/Makefile.am
+++ b/lib/wccp/Makefile.am
@@ -21,7 +21,7 @@ include $(top_srcdir)/build/tidy.mk
AM_CPPFLAGS = \
-I$(abs_top_srcdir)/lib \
- -I$(abs_top_srcdir)/proxy/api/ts
+ -I$(abs_top_srcdir)/proxy
#WCCP_DEFS = @WCCP_DEFS@
#DEFS += $(WCCP_DEFS)
diff --git a/lib/wccp/WccpMsg.cc b/lib/wccp/WccpMsg.cc
index 4ecda87..d03283b 100644
--- a/lib/wccp/WccpMsg.cc
+++ b/lib/wccp/WccpMsg.cc
@@ -23,7 +23,7 @@
#include "WccpLocal.h"
#include <errno.h>
#include <openssl/md5.h>
-#include <TsException.h>
+#include "api/ts/TsException.h"
#include "ts/ink_memory.h"
#include "ts/ink_string.h"
diff --git a/mgmt/Makefile.am b/mgmt/Makefile.am
index 06c7591..56cdb77 100644
--- a/mgmt/Makefile.am
+++ b/mgmt/Makefile.am
@@ -30,7 +30,6 @@ AM_CPPFLAGS = \
-I$(abs_top_srcdir)/mgmt/api/include \
-I$(abs_top_srcdir)/mgmt/cluster \
-I$(abs_top_srcdir)/mgmt/utils \
- -I$(abs_top_srcdir)/proxy/api/ts \
-I$(abs_top_srcdir)/proxy \
-I$(abs_top_srcdir)/proxy/hdrs \
-I$(abs_top_srcdir)/lib/records \
diff --git a/plugins/experimental/memcache/Makefile.inc b/plugins/experimental/memcache/Makefile.inc
index 1ef98c7..4966674 100644
--- a/plugins/experimental/memcache/Makefile.inc
+++ b/plugins/experimental/memcache/Makefile.inc
@@ -16,7 +16,7 @@
experimental_memcache_tsmemcache_la_CPPFLAGS = \
$(AM_CPPFLAGS) \
- -I$(abs_top_srcdir)/proxy/api/ts \
+ -I$(abs_top_srcdir)/proxy \
-I$(abs_top_srcdir)/iocore/aio \
-I$(abs_top_srcdir)/iocore/cache \
-I$(abs_top_srcdir)/iocore/eventsystem \
diff --git a/plugins/experimental/memcache/tsmemcache.h b/plugins/experimental/memcache/tsmemcache.h
index c86c6f9..5002e00 100644
--- a/plugins/experimental/memcache/tsmemcache.h
+++ b/plugins/experimental/memcache/tsmemcache.h
@@ -29,7 +29,7 @@
#include "I_Cache.h"
#include "I_Version.h"
-#include "ts.h" // plugin header
+#include "ts/ts.h" // plugin header
#include "protocol_binary.h"
#include "ink_memory.h"
#include "ink_hrtime.h"
diff --git a/proxy/FetchSM.cc b/proxy/FetchSM.cc
index 7b7332a..0b12623 100644
--- a/proxy/FetchSM.cc
+++ b/proxy/FetchSM.cc
@@ -26,6 +26,7 @@
#include <stdio.h>
#include "HTTP.h"
#include "PluginVC.h"
+#include "api/ts/ts.h" // Ugly, but we need a bunch of the public APIs here ... :-/
#define DEBUG_TAG "FetchSM"
#define FETCH_LOCK_RETRY_TIME HRTIME_MSECONDS(10)
diff --git a/proxy/FetchSM.h b/proxy/FetchSM.h
index b2498ec..277e6d4 100644
--- a/proxy/FetchSM.h
+++ b/proxy/FetchSM.h
@@ -31,7 +31,6 @@
#define _FETCH_SM_H
#include "P_Net.h"
-#include "ts.h"
#include "HttpSM.h"
#include "HttpTunnel.h"
diff --git a/proxy/InkAPI.cc b/proxy/InkAPI.cc
index 466a92b..e8f63e2 100644
--- a/proxy/InkAPI.cc
+++ b/proxy/InkAPI.cc
@@ -27,7 +27,6 @@
#include "ts/ink_base64.h"
#include "ts/I_Layout.h"
-#include "ts.h"
#include "InkAPIInternal.h"
#include "Log.h"
#include "URL.h"
@@ -61,6 +60,8 @@
#include "I_Machine.h"
#include "HttpProxyServerMain.h"
+#include "api/ts/ts.h"
+
/****************************************************************
* IMPORTANT - READ ME
* Any plugin using the IO Core must enter
@@ -1802,7 +1803,8 @@ TSTrafficServerVersionGetPatch()
const char *
TSPluginDirGet(void)
{
- static const char *path = RecConfigReadPrefixPath("proxy.config.plugin.plugin_dir");
+ static const char *path = RecConfigReadPluginDir();
+
return path;
}
@@ -6084,7 +6086,7 @@ void
TSHttpSsnDebugSet(TSHttpSsn ssnp, int on)
{
sdk_assert(sdk_sanity_check_http_ssn(ssnp) == TS_SUCCESS);
- (reinterpret_cast<ProxyClientSession *>(ssnp))->debug_on = on;
+ (reinterpret_cast<ProxyClientSession *>(ssnp))->set_debug(0 != on);
}
int
diff --git a/proxy/InkAPIInternal.h b/proxy/InkAPIInternal.h
index a3248b8..f4f21ab 100644
--- a/proxy/InkAPIInternal.h
+++ b/proxy/InkAPIInternal.h
@@ -27,15 +27,15 @@
#include "P_EventSystem.h"
#include "URL.h"
#include "P_Net.h"
-#include "ts.h"
-#include "experimental.h"
-#include "InkAPIPrivateIOCore.h"
#include "HTTP.h"
#include "ts/List.h"
#include "ProxyConfig.h"
#include "P_Cache.h"
#include "I_Tasks.h"
+#include "api/ts/InkAPIPrivateIOCore.h"
+#include "api/ts/experimental.h"
+
/* Some defines that might be candidates for configurable settings later.
*/
#define HTTP_SSN_TXN_MAX_USER_ARG 16 /* max number of user arguments for Transactions and Sessions */
diff --git a/proxy/InkIOCoreAPI.cc b/proxy/InkIOCoreAPI.cc
index 3641dd2..ec18570 100644
--- a/proxy/InkIOCoreAPI.cc
+++ b/proxy/InkIOCoreAPI.cc
@@ -28,6 +28,7 @@
*/
#include "ts/ink_platform.h"
+#include "api/ts/ts.h"
#include "api/ts/InkAPIPrivateIOCore.h"
#if defined(solaris) && !defined(__GNUC__)
#include "P_EventSystem.h" // I_EventSystem.h
diff --git a/proxy/Main.cc b/proxy/Main.cc
index 7865ab9..47d7943 100644
--- a/proxy/Main.cc
+++ b/proxy/Main.cc
@@ -38,6 +38,8 @@
#include "ts/ink_syslog.h"
#include "ts/hugepages.h"
+#include "api/ts/ts.h" // This is sadly needed because of us using TSThreadInit() for some reason.
+
#include <syslog.h>
#if !defined(linux)
diff --git a/proxy/Makefile.am b/proxy/Makefile.am
index d44cdd0..abf89c7 100644
--- a/proxy/Makefile.am
+++ b/proxy/Makefile.am
@@ -41,7 +41,6 @@ AM_CPPFLAGS = \
-I$(abs_srcdir)/shared \
-I$(abs_top_srcdir)/mgmt \
-I$(abs_top_srcdir)/mgmt/utils \
- -I$(abs_top_srcdir)/proxy/api/ts \
-I$(abs_top_srcdir)/lib \
@OPENSSL_INCLUDES@
diff --git a/proxy/ParentSelection.cc b/proxy/ParentSelection.cc
index 6659f9d..ffb476a 100644
--- a/proxy/ParentSelection.cc
+++ b/proxy/ParentSelection.cc
@@ -323,7 +323,7 @@ UnavailableServerResponseCodes::UnavailableServerResponseCodes(char *val)
for (int i = 0; i < numTok; i++) {
c = atoi(pTok[i]);
if (c > 500 && c < 600) {
- TSDebug("parent_select", "loading response code: %d", c);
+ Debug("parent_select", "loading response code: %d", c);
codes.push_back(c);
}
}
@@ -499,7 +499,7 @@ ParentRecord::DefaultInit(char *val)
return false;
} else {
ParentRR_t round_robin = P_NO_ROUND_ROBIN;
- TSDebug("parent_select", "allocating ParentRoundRobin() lookup strategy.");
+ Debug("parent_select", "allocating ParentRoundRobin() lookup strategy.");
selection_strategy = new ParentRoundRobin(this, round_robin);
return true;
}
@@ -687,11 +687,11 @@ ParentRecord::Init(matcher_line *line_info)
case P_STRICT_ROUND_ROBIN:
case P_HASH_ROUND_ROBIN:
case P_LATCHED_ROUND_ROBIN:
- TSDebug("parent_select", "allocating ParentRoundRobin() lookup strategy.");
+ Debug("parent_select", "allocating ParentRoundRobin() lookup strategy.");
selection_strategy = new ParentRoundRobin(this, round_robin);
break;
case P_CONSISTENT_HASH:
- TSDebug("parent_select", "allocating ParentConsistentHash() lookup strategy.");
+ Debug("parent_select", "allocating ParentConsistentHash() lookup strategy.");
selection_strategy = new ParentConsistentHash(this);
break;
default:
diff --git a/proxy/Plugin.cc b/proxy/Plugin.cc
index 5ae13c9..4824a46 100644
--- a/proxy/Plugin.cc
+++ b/proxy/Plugin.cc
@@ -231,8 +231,7 @@ plugin_init(bool validateOnly)
if (INIT_ONCE) {
api_init();
- TSConfigDirGet();
- plugin_dir = TSPluginDirGet();
+ plugin_dir = RecConfigReadPluginDir();
INIT_ONCE = false;
}
diff --git a/proxy/ProxyClientSession.h b/proxy/ProxyClientSession.h
index 4bd9dc6..831a654 100644
--- a/proxy/ProxyClientSession.h
+++ b/proxy/ProxyClientSession.h
@@ -88,6 +88,12 @@ public:
user_args[ix] = arg;
}
+ void
+ set_debug(bool flag)
+ {
+ debug_on = flag;
+ }
+
// Return whether debugging is enabled for this session.
bool
debug() const
@@ -263,8 +269,6 @@ private:
// be active until the transaction goes through or the client
// aborts.
bool m_active;
-
- friend void TSHttpSsnDebugSet(TSHttpSsn, int);
};
#endif // __PROXY_CLIENT_SESSION_H__
diff --git a/proxy/api/ts/InkAPIPrivateIOCore.h b/proxy/api/ts/InkAPIPrivateIOCore.h
index 1e8d253..8b0ef83 100644
--- a/proxy/api/ts/InkAPIPrivateIOCore.h
+++ b/proxy/api/ts/InkAPIPrivateIOCore.h
@@ -23,7 +23,6 @@
#ifndef __INK_API_PRIVATE_IOCORE_H__
#define __INK_API_PRIVATE_IOCORE_H__
-#include "ts.h"
#if !defined(__GNUC__)
#include "I_EventSystem.h"
#include "I_Cache.h"
diff --git a/proxy/http/HttpDebugNames.h b/proxy/http/HttpDebugNames.h
index 6f33cb2..9db419d 100644
--- a/proxy/http/HttpDebugNames.h
+++ b/proxy/http/HttpDebugNames.h
@@ -25,7 +25,6 @@
#define _HttpDebugNames_h_
#include "HttpTransact.h"
-#include "api/ts/ts.h"
class HttpDebugNames
{
diff --git a/proxy/http/Makefile.am b/proxy/http/Makefile.am
index 8bb472e..d2544ee 100644
--- a/proxy/http/Makefile.am
+++ b/proxy/http/Makefile.am
@@ -22,7 +22,6 @@ SUBDIRS = remap
AM_CPPFLAGS = \
$(iocore_include_dirs) \
- -I$(abs_top_srcdir)/proxy/api/ts \
-I$(abs_top_srcdir)/proxy \
-I$(abs_top_srcdir)/lib \
-I$(abs_top_srcdir)/lib/records \
diff --git a/proxy/http/remap/Makefile.am b/proxy/http/remap/Makefile.am
index 6e72f64..032123f 100644
--- a/proxy/http/remap/Makefile.am
+++ b/proxy/http/remap/Makefile.am
@@ -22,7 +22,6 @@ AM_CPPFLAGS = \
$(iocore_include_dirs) \
-I$(abs_top_srcdir)/lib \
-I$(abs_top_srcdir)/lib/records \
- -I$(abs_top_srcdir)/proxy/api/ts \
-I$(abs_top_srcdir)/proxy \
-I$(abs_top_srcdir)/mgmt \
-I$(abs_top_srcdir)/mgmt/utils \
diff --git a/proxy/http/remap/RemapConfig.cc b/proxy/http/remap/RemapConfig.cc
index 40f245b..15bab02 100644
--- a/proxy/http/remap/RemapConfig.cc
+++ b/proxy/http/remap/RemapConfig.cc
@@ -778,7 +778,7 @@ remap_load_plugin(const char **argv, int argc, url_mapping *mp, char *errbuf, in
}
if (stat(c, &stat_buf) != 0) {
- const char *plugin_default_path = TSPluginDirGet();
+ ats_scoped_str plugin_default_path(RecConfigReadPluginDir());
// Try with the plugin path instead
if (strlen(c) + strlen(plugin_default_path) > (PATH_NAME_MAX - 1)) {
@@ -786,7 +786,7 @@ remap_load_plugin(const char **argv, int argc, url_mapping *mp, char *errbuf, in
return -3;
}
- snprintf(default_path, PATH_NAME_MAX, "%s/%s", plugin_default_path, c);
+ snprintf(default_path, PATH_NAME_MAX, "%s/%s", static_cast<char *>(plugin_default_path), c);
Debug("remap_plugin", "attempting to stat default plugin path: %s", default_path);
if (stat(default_path, &stat_buf) == 0) {
diff --git a/proxy/http/remap/RemapPluginInfo.h b/proxy/http/remap/RemapPluginInfo.h
index b507e5c..d23cb5e 100644
--- a/proxy/http/remap/RemapPluginInfo.h
+++ b/proxy/http/remap/RemapPluginInfo.h
@@ -24,7 +24,8 @@
#if !defined(_REMAPPLUGININFO_h_)
#define _REMAPPLUGININFO_h_
#include "ts/ink_platform.h"
-#include "api/ts/ts.h"
+
+#include "ts/apidefs.h"
#include "api/ts/remap.h"
#define TSREMAP_FUNCNAME_INIT "TSRemapInit"
diff --git a/proxy/http/remap/RemapPlugins.h b/proxy/http/remap/RemapPlugins.h
index ebc81d0..e7c6dd9 100644
--- a/proxy/http/remap/RemapPlugins.h
+++ b/proxy/http/remap/RemapPlugins.h
@@ -31,8 +31,6 @@
#include "ts/ink_platform.h"
#include "I_EventSystem.h"
#include "RemapProcessor.h"
-#include "api/ts/ts.h"
-#include "api/ts/remap.h"
#include "RemapPluginInfo.h"
#include "HttpTransact.h"
#include "ReverseProxy.h"
diff --git a/proxy/http2/Makefile.am b/proxy/http2/Makefile.am
index 95cd134..9d61aa5 100644
--- a/proxy/http2/Makefile.am
+++ b/proxy/http2/Makefile.am
@@ -20,7 +20,6 @@ include $(top_srcdir)/build/tidy.mk
AM_CPPFLAGS = \
$(iocore_include_dirs) \
- -I$(abs_top_srcdir)/proxy/api/ts \
-I$(abs_top_srcdir)/lib \
-I$(abs_top_srcdir)/lib/records \
-I$(abs_top_srcdir)/mgmt \
diff --git a/proxy/logging/Makefile.am b/proxy/logging/Makefile.am
index 97f6f99..e7d5251 100644
--- a/proxy/logging/Makefile.am
+++ b/proxy/logging/Makefile.am
@@ -23,7 +23,6 @@ AM_CPPFLAGS = \
-I$(abs_top_srcdir)/lib \
-I$(abs_top_srcdir)/lib/luajit/src \
-I$(abs_top_srcdir)/lib/records \
- -I$(abs_top_srcdir)/proxy/api/ts \
-I$(abs_top_srcdir)/proxy \
-I$(abs_top_srcdir)/proxy/http \
-I$(abs_top_srcdir)/proxy/http/remap \
diff --git a/proxy/shared/Makefile.am b/proxy/shared/Makefile.am
index 3a43fec..978f0c0 100644
--- a/proxy/shared/Makefile.am
+++ b/proxy/shared/Makefile.am
@@ -31,7 +31,6 @@ AM_CPPFLAGS = \
-I$(abs_top_srcdir)/mgmt/api/include \
-I$(abs_top_srcdir)/mgmt/utils \
-I$(abs_top_srcdir) \
- -I$(abs_top_srcdir)/proxy/api/ts \
-I$(abs_top_srcdir)/proxy \
-I$(abs_top_srcdir)/proxy/http \
-I$(abs_top_srcdir)/proxy/hdrs \
--
To stop receiving notification emails like this one, please contact
['"commits@trafficserver.apache.org" <co...@trafficserver.apache.org>'].