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 2015/07/16 23:51:10 UTC
[1/7] trafficserver git commit: TS-3759 Eliminate -Ilib/ts,
checkpoint 3
Repository: trafficserver
Updated Branches:
refs/heads/master a7a95706f -> bcec70dc8
TS-3759 Eliminate -Ilib/ts, checkpoint 3
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/3fe162d5
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/3fe162d5
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/3fe162d5
Branch: refs/heads/master
Commit: 3fe162d541ad74c54295d7b1d79d7adaf291df24
Parents: e568bb3
Author: Leif Hedstrom <zw...@apache.org>
Authored: Thu Jul 16 12:09:51 2015 -0600
Committer: Leif Hedstrom <zw...@apache.org>
Committed: Thu Jul 16 14:25:32 2015 -0600
----------------------------------------------------------------------
cmd/traffic_manager/traffic_manager.cc | 4 +
lib/ts/MatcherUtils.h | 2 +
lib/ts/SimpleTokenizer.h | 1 +
lib/ts/libts.h | 111 ----------------------------
mgmt/Alarms.cc | 5 +-
mgmt/BaseManager.cc | 4 +-
mgmt/LocalManager.cc | 3 +-
mgmt/MultiFile.cc | 3 +-
mgmt/ProcessManager.cc | 3 +-
mgmt/ProxyConfig.h | 3 +-
mgmt/Rollback.cc | 6 +-
mgmt/api/CfgContextImpl.cc | 2 +-
mgmt/api/CfgContextUtils.cc | 3 +-
mgmt/api/CoreAPI.cc | 4 +-
mgmt/api/CoreAPIShared.cc | 5 +-
mgmt/api/GenericParser.cc | 3 +-
mgmt/api/TSControlMain.cc | 3 +-
mgmt/cluster/VMap.h | 4 +-
mgmt/utils/MgmtMarshall.cc | 4 +-
mgmt/utils/MgmtUtils.cc | 3 +-
proxy/AbstractBuffer.h | 5 +-
proxy/ControlBase.h | 3 +-
proxy/ControlMatcher.cc | 4 +-
proxy/ControlMatcher.h | 3 +-
proxy/CoreUtils.cc | 2 +-
proxy/ICP.cc | 2 +-
proxy/ICPConfig.cc | 2 +-
proxy/IPAllow.cc | 2 +-
proxy/InkAPI.cc | 2 +-
proxy/InkIOCoreAPI.cc | 2 +-
proxy/Main.cc | 2 +-
proxy/Main.h | 3 +-
proxy/ParentSelection.cc | 2 +-
proxy/ParentSelection.h | 2 +-
proxy/ProxyClientSession.h | 2 +-
proxy/ReverseProxy.cc | 2 +-
proxy/SocksProxy.cc | 2 +-
proxy/StatSystem.h | 2 +
proxy/TestClusterHash.cc | 2 +-
proxy/TestDNS.cc | 2 +-
proxy/congest/Congestion.cc | 2 +-
proxy/congest/Congestion.h | 2 +-
proxy/congest/CongestionDB.cc | 2 +-
proxy/congest/CongestionTest.cc | 2 +-
proxy/hdrs/HTTP.cc | 4 +-
proxy/hdrs/HdrHeap.cc | 2 +-
proxy/hdrs/HdrTSOnly.cc | 2 +-
proxy/hdrs/HdrTest.cc | 4 +-
proxy/hdrs/HdrToken.cc | 5 +-
proxy/hdrs/HdrUtils.cc | 2 +-
proxy/hdrs/HttpCompat.cc | 2 +-
proxy/hdrs/MIME.cc | 4 +-
proxy/hdrs/URL.cc | 4 +-
proxy/http/HttpBodyFactory.cc | 2 +-
proxy/http/HttpBodyFactory.h | 2 +-
proxy/http/HttpClientSession.h | 2 +-
proxy/http/HttpConfig.h | 2 +-
proxy/http/HttpConnectionCount.h | 4 +-
proxy/http/HttpSM.h | 2 +-
proxy/http/HttpSessionAccept.h | 2 +-
proxy/http/HttpTransact.cc | 2 +-
proxy/http/HttpTransact.h | 2 +-
proxy/http/HttpTransactCache.cc | 2 +-
proxy/http/HttpTransactCache.h | 2 +-
proxy/http/HttpTransactHeaders.cc | 2 +-
proxy/http/HttpTunnel.h | 2 +-
proxy/http/remap/AclFiltering.h | 2 +-
proxy/http/remap/RemapConfig.cc | 3 +-
proxy/http/remap/RemapPluginInfo.cc | 2 +
proxy/http/remap/RemapPluginInfo.h | 2 +-
proxy/http/remap/RemapPlugins.h | 2 +-
proxy/http/remap/UrlMapping.h | 1 +
proxy/http/remap/UrlMappingPathIndex.h | 2 +-
proxy/http2/HPACK.h | 4 +-
proxy/http2/Http2SessionAccept.h | 2 +-
proxy/http2/HuffmanCodec.cc | 4 +-
proxy/logging/Log.cc | 2 +-
proxy/logging/Log.h | 2 +-
proxy/logging/LogAccess.cc | 2 +-
proxy/logging/LogAccess.h | 4 +-
proxy/logging/LogAccessHttp.cc | 2 +-
proxy/logging/LogAccessICP.cc | 2 +-
proxy/logging/LogBuffer.cc | 2 +-
proxy/logging/LogBuffer.h | 2 +-
proxy/logging/LogCollationAccept.cc | 2 +-
proxy/logging/LogCollationClientSM.cc | 2 +-
proxy/logging/LogConfig.cc | 2 +-
proxy/logging/LogConfig.h | 2 +-
proxy/logging/LogField.cc | 2 +-
proxy/logging/LogField.h | 3 +-
proxy/logging/LogFieldAliasMap.cc | 1 +
proxy/logging/LogFieldAliasMap.h | 2 +-
proxy/logging/LogFile.cc | 2 +-
proxy/logging/LogFile.h | 2 +-
proxy/logging/LogFilter.cc | 2 +-
proxy/logging/LogFilter.h | 2 +-
proxy/logging/LogFormat.h | 2 +-
proxy/logging/LogHost.cc | 2 +-
proxy/logging/LogObject.cc | 2 +-
proxy/logging/LogObject.h | 2 +-
proxy/logging/LogSock.h | 2 +-
proxy/logging/LogStandalone.cc | 2 +-
proxy/logging/LogUtils.h | 2 +-
proxy/logstats.cc | 3 +-
proxy/sac.cc | 2 +-
proxy/shared/DiagsConfig.cc | 4 +-
proxy/shared/Error.cc | 2 +
proxy/shared/Error.h | 2 +-
proxy/shared/InkXml.cc | 4 +-
proxy/shared/UglyLogStubs.cc | 2 +-
proxy/spdy/SpdyCommon.h | 2 +-
111 files changed, 174 insertions(+), 216 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/3fe162d5/cmd/traffic_manager/traffic_manager.cc
----------------------------------------------------------------------
diff --git a/cmd/traffic_manager/traffic_manager.cc b/cmd/traffic_manager/traffic_manager.cc
index a290c15..d0ed870 100644
--- a/cmd/traffic_manager/traffic_manager.cc
+++ b/cmd/traffic_manager/traffic_manager.cc
@@ -23,6 +23,10 @@
#include "ts/ink_sys_control.h"
#include "ts/ink_cap.h"
+#include "ts/ink_lockfile.h"
+#include "ts/ink_sock.h"
+#include "ts/ink_args.h"
+#include "ts/ink_syslog.h"
#include "WebMgmtUtils.h"
#include "NetworkUtilsRemote.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/3fe162d5/lib/ts/MatcherUtils.h
----------------------------------------------------------------------
diff --git a/lib/ts/MatcherUtils.h b/lib/ts/MatcherUtils.h
index 89342c3..d53ca8b 100644
--- a/lib/ts/MatcherUtils.h
+++ b/lib/ts/MatcherUtils.h
@@ -33,6 +33,8 @@
#define _MATCHER_UTILS_H_
#include "ts/ParseRules.h"
+#include "ts/ink_inet.h"
+
// Look in MatcherUtils.cc for comments on function usage
char *readIntoBuffer(const char *file_path, const char *module_name, int *read_size_ptr);
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/3fe162d5/lib/ts/SimpleTokenizer.h
----------------------------------------------------------------------
diff --git a/lib/ts/SimpleTokenizer.h b/lib/ts/SimpleTokenizer.h
index 2a5812a..c64c2ea 100644
--- a/lib/ts/SimpleTokenizer.h
+++ b/lib/ts/SimpleTokenizer.h
@@ -27,6 +27,7 @@
#include <stdlib.h>
#include <string.h>
#include <ctype.h>
+#include "ts/ink_memory.h"
/*-----------------------------------------------------------------------------
SimpleTokenizer
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/3fe162d5/lib/ts/libts.h
----------------------------------------------------------------------
diff --git a/lib/ts/libts.h b/lib/ts/libts.h
deleted file mode 100644
index 8c2edf1..0000000
--- a/lib/ts/libts.h
+++ /dev/null
@@ -1,111 +0,0 @@
-/** @file
-
- Primary include file for the libts C++ library
-
- @section license License
-
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
- @section details Details
-
- libts is a collection of useful functions and methods. It
- includes commonly used:
- - data structures like queues, dynamic arrays atomic queues, etc.
- - string manipulation functions
- - bit operation functions
- - Fast-Allocators ...
-
- The library provides a uniform interface on all platforms making the
- job of porting the applications written using it very easy.
-
- */
-
-#if !defined(_inktomiplus_h_)
-#define _inktomiplus_h_
-
-/* Removed for now, to fix build on Solaris
-#define std *** _FIXME_REMOVE_DEPENDENCY_ON_THE_STL_ ***
-*/
-
-#include "ts/hugepages.h"
-#include "ts/ink_config.h"
-#include "ts/ink_platform.h"
-#include "ts/ink_align.h"
-#include "ts/ink_apidefs.h"
-#include "ts/ink_args.h"
-#include "ts/ink_assert.h"
-#include "ts/ink_atomic.h"
-#include "ts/ink_base64.h"
-#include "ts/ink_code.h"
-#include "ts/ink_defs.h"
-#include "ts/ink_error.h"
-#include "ts/ink_exception.h"
-#include "ts/ink_file.h"
-#include "ts/ink_hash_table.h"
-#include "ts/ink_hrtime.h"
-#include "ts/ink_inout.h"
-#include "ts/ink_llqueue.h"
-#include "ts/ink_lockfile.h"
-#include "ts/ink_memory.h"
-#include "ts/ink_mutex.h"
-#include "ts/ink_queue.h"
-#include "ts/ink_rand.h"
-#include "ts/ink_resolver.h"
-#include "ts/ink_sock.h"
-#include "ts/ink_inet.h"
-#include "ts/ink_sprintf.h"
-#include "ts/ink_stack_trace.h"
-#include "ts/ink_string++.h"
-#include "ts/ink_string.h"
-#include "ts/ink_syslog.h"
-#include "ts/ink_thread.h"
-#include "ts/ink_time.h"
-#include "ts/fastlz.h"
-
-#include "ts/Allocator.h"
-#include "ts/Arena.h"
-#include "ts/Bitops.h"
-#include "ts/ConsistentHash.h"
-#include "ts/DynArray.h"
-#include "ts/EventNotify.h"
-#include "ts/Hash.h"
-#include "ts/HashFNV.h"
-#include "ts/HashMD5.h"
-#include "ts/HashSip.h"
-#include "ts/I_Version.h"
-#include "ts/InkPool.h"
-#include "ts/List.h"
-#include "ts/INK_MD5.h"
-#include "ts/MMH.h"
-#include "ts/Map.h"
-#include "ts/MimeTable.h"
-#include "ts/ParseRules.h"
-#include "ts/Ptr.h"
-#include "ts/RawHashTable.h"
-#include "ts/Regex.h"
-#include "ts/SimpleTokenizer.h"
-#include "ts/TextBuffer.h"
-#include "ts/Tokenizer.h"
-#include "ts/MatcherUtils.h"
-#include "ts/Diags.h"
-#include "ts/Regression.h"
-#include "ts/HostLookup.h"
-#include "ts/InkErrno.h"
-#include "ts/Vec.h"
-#include "ts/X509HostnameValidator.h"
-
-#endif /*_inktomiplus_h_*/
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/3fe162d5/mgmt/Alarms.cc
----------------------------------------------------------------------
diff --git a/mgmt/Alarms.cc b/mgmt/Alarms.cc
index fe2c4af..7bfee8a 100644
--- a/mgmt/Alarms.cc
+++ b/mgmt/Alarms.cc
@@ -22,7 +22,10 @@
*/
-#include "ts/libts.h"
+#include "ts/ink_platform.h"
+#include "ts/ink_string.h"
+#include "ts/ink_file.h"
+#include "ts/ink_time.h"
#include "LocalManager.h"
#include "ClusterCom.h"
#include "MgmtUtils.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/3fe162d5/mgmt/BaseManager.cc
----------------------------------------------------------------------
diff --git a/mgmt/BaseManager.cc b/mgmt/BaseManager.cc
index 3e93deb..afa05bc 100644
--- a/mgmt/BaseManager.cc
+++ b/mgmt/BaseManager.cc
@@ -31,7 +31,9 @@
*
*/
-#include "ts/libts.h"
+#include "ts/ink_platform.h"
+#include "ts/ink_hash_table.h"
+#include "ts/ink_memory.h"
#include "BaseManager.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/3fe162d5/mgmt/LocalManager.cc
----------------------------------------------------------------------
diff --git a/mgmt/LocalManager.cc b/mgmt/LocalManager.cc
index 67978ff..4630969 100644
--- a/mgmt/LocalManager.cc
+++ b/mgmt/LocalManager.cc
@@ -22,8 +22,9 @@
*/
-#include "ts/libts.h"
#include "ts/ink_platform.h"
+#include "ts/ink_sock.h"
+#include "ts/ink_file.h"
#include "MgmtUtils.h"
#include "ts/I_Layout.h"
#include "LocalManager.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/3fe162d5/mgmt/MultiFile.cc
----------------------------------------------------------------------
diff --git a/mgmt/MultiFile.cc b/mgmt/MultiFile.cc
index 5643312..9bd04d3 100644
--- a/mgmt/MultiFile.cc
+++ b/mgmt/MultiFile.cc
@@ -21,9 +21,8 @@
limitations under the License.
*/
-#include "ts/libts.h"
-
#include "ts/ink_platform.h"
+#include "ts/ink_memory.h"
#include "ts/ink_defs.h"
#include "ts/ink_assert.h"
#include "ts/ink_error.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/3fe162d5/mgmt/ProcessManager.cc
----------------------------------------------------------------------
diff --git a/mgmt/ProcessManager.cc b/mgmt/ProcessManager.cc
index 0b48350..b37a9bc 100644
--- a/mgmt/ProcessManager.cc
+++ b/mgmt/ProcessManager.cc
@@ -22,7 +22,8 @@
*/
-#include "ts/libts.h"
+#include "ts/ink_platform.h"
+
#undef HTTP_CACHE
#include "InkAPIInternal.h"
#include "MgmtUtils.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/3fe162d5/mgmt/ProxyConfig.h
----------------------------------------------------------------------
diff --git a/mgmt/ProxyConfig.h b/mgmt/ProxyConfig.h
index d17fec5..ea481e7 100644
--- a/mgmt/ProxyConfig.h
+++ b/mgmt/ProxyConfig.h
@@ -31,7 +31,8 @@
#ifndef _Proxy_Config_h
#define _Proxy_Config_h
-#include "ts/libts.h"
+#include "ts/ink_platform.h"
+#include "ts/ink_memory.h"
#include "ProcessManager.h"
#include "I_EventSystem.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/3fe162d5/mgmt/Rollback.cc
----------------------------------------------------------------------
diff --git a/mgmt/Rollback.cc b/mgmt/Rollback.cc
index 05044ea..e7d581b 100644
--- a/mgmt/Rollback.cc
+++ b/mgmt/Rollback.cc
@@ -21,7 +21,11 @@
limitations under the License.
*/
-#include "ts/libts.h"
+#include "ts/ink_platform.h"
+#include "ts/ink_string.h"
+#include "ts/ink_memory.h"
+#include "ts/ink_time.h"
+#include "ts/ink_file.h"
#include "LocalManager.h"
#include "Rollback.h"
#include "WebMgmtUtils.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/3fe162d5/mgmt/api/CfgContextImpl.cc
----------------------------------------------------------------------
diff --git a/mgmt/api/CfgContextImpl.cc b/mgmt/api/CfgContextImpl.cc
index 3756599..3abb06e 100644
--- a/mgmt/api/CfgContextImpl.cc
+++ b/mgmt/api/CfgContextImpl.cc
@@ -22,8 +22,8 @@
*/
-#include "ts/libts.h"
#include "ts/ink_platform.h"
+#include "ts/ink_string.h"
#include "CfgContextImpl.h"
#include "CfgContextUtils.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/3fe162d5/mgmt/api/CfgContextUtils.cc
----------------------------------------------------------------------
diff --git a/mgmt/api/CfgContextUtils.cc b/mgmt/api/CfgContextUtils.cc
index 2db5077..c9507bb 100644
--- a/mgmt/api/CfgContextUtils.cc
+++ b/mgmt/api/CfgContextUtils.cc
@@ -21,8 +21,9 @@
limitations under the License.
*/
-#include "ts/libts.h"
#include "ts/ink_platform.h"
+#include "ts/ParseRules.h"
+#include "ts/ink_string.h"
#include "CfgContextUtils.h"
#include "ts/Tokenizer.h"
/***************************************************************************
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/3fe162d5/mgmt/api/CoreAPI.cc
----------------------------------------------------------------------
diff --git a/mgmt/api/CoreAPI.cc b/mgmt/api/CoreAPI.cc
index e7d61c7..b14320b 100644
--- a/mgmt/api/CoreAPI.cc
+++ b/mgmt/api/CoreAPI.cc
@@ -29,7 +29,9 @@
*
***************************************************************************/
-#include "ts/libts.h"
+#include "ts/ink_platform.h"
+#include "ts/ink_file.h"
+#include "ts/ParseRules.h"
#include "MgmtUtils.h"
#include "LocalManager.h"
#include "ClusterCom.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/3fe162d5/mgmt/api/CoreAPIShared.cc
----------------------------------------------------------------------
diff --git a/mgmt/api/CoreAPIShared.cc b/mgmt/api/CoreAPIShared.cc
index 188f40c..926d23e 100644
--- a/mgmt/api/CoreAPIShared.cc
+++ b/mgmt/api/CoreAPIShared.cc
@@ -21,7 +21,10 @@
See the License for the specific language governing permissions and
limitations under the License.
*/
-#include "ts/libts.h"
+#include "ts/ink_platform.h"
+#include "ts/ink_sock.h"
+#include "ts/ink_string.h"
+#include "ts/ink_memory.h"
#include "CoreAPIShared.h"
#include "MgmtSocket.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/3fe162d5/mgmt/api/GenericParser.cc
----------------------------------------------------------------------
diff --git a/mgmt/api/GenericParser.cc b/mgmt/api/GenericParser.cc
index 575fd40..66d18f4 100644
--- a/mgmt/api/GenericParser.cc
+++ b/mgmt/api/GenericParser.cc
@@ -21,7 +21,8 @@
limitations under the License.
*/
-#include "ts/libts.h"
+#include "ts/ink_platform.h"
+#include "ts/ink_string.h"
#include "GenericParser.h"
/***************************************************************************
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/3fe162d5/mgmt/api/TSControlMain.cc
----------------------------------------------------------------------
diff --git a/mgmt/api/TSControlMain.cc b/mgmt/api/TSControlMain.cc
index 54113f0..296b7d5 100644
--- a/mgmt/api/TSControlMain.cc
+++ b/mgmt/api/TSControlMain.cc
@@ -31,7 +31,8 @@
***************************************************************************/
#include "mgmtapi.h"
-#include "ts/libts.h"
+#include "ts/ink_platform.h"
+#include "ts/ink_sock.h"
#include "LocalManager.h"
#include "MgmtUtils.h"
#include "MgmtSocket.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/3fe162d5/mgmt/cluster/VMap.h
----------------------------------------------------------------------
diff --git a/mgmt/cluster/VMap.h b/mgmt/cluster/VMap.h
index 6bdf0e5..6e092ec 100644
--- a/mgmt/cluster/VMap.h
+++ b/mgmt/cluster/VMap.h
@@ -24,7 +24,9 @@
#ifndef _VMAP_H
#define _VMAP_H
-#include "ts/libts.h"
+#include "ts/ink_platform.h"
+#include "ts/I_Version.h"
+#include "ts/ink_string.h"
#define MAX_INTERFACE 16
#define MAX_SUB_ID 8
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/3fe162d5/mgmt/utils/MgmtMarshall.cc
----------------------------------------------------------------------
diff --git a/mgmt/utils/MgmtMarshall.cc b/mgmt/utils/MgmtMarshall.cc
index 701ef65..f4531b2 100644
--- a/mgmt/utils/MgmtMarshall.cc
+++ b/mgmt/utils/MgmtMarshall.cc
@@ -21,7 +21,9 @@
limitations under the License.
*/
-#include "ts/libts.h"
+#include "ts/ink_platform.h"
+#include "ts/ink_memory.h"
+#include "ts/ink_assert.h"
#include "MgmtMarshall.h"
#include "MgmtSocket.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/3fe162d5/mgmt/utils/MgmtUtils.cc
----------------------------------------------------------------------
diff --git a/mgmt/utils/MgmtUtils.cc b/mgmt/utils/MgmtUtils.cc
index b447e67..304157d 100644
--- a/mgmt/utils/MgmtUtils.cc
+++ b/mgmt/utils/MgmtUtils.cc
@@ -20,7 +20,8 @@
See the License for the specific language governing permissions and
limitations under the License.
*/
-#include "ts/libts.h"
+#include "ts/ink_platform.h"
+#include "ts/ink_sock.h"
#include "MgmtUtils.h"
#include "ts/Diags.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/3fe162d5/proxy/AbstractBuffer.h
----------------------------------------------------------------------
diff --git a/proxy/AbstractBuffer.h b/proxy/AbstractBuffer.h
index d86f763..1b4ffb3 100644
--- a/proxy/AbstractBuffer.h
+++ b/proxy/AbstractBuffer.h
@@ -25,8 +25,9 @@
#define __ABSTRACT_BUFFER_H__
-#include "ts/libts.h"
-
+#include "ts/ink_platform.h"
+#include "ts/ink_atomic.h"
+#include "ts/ink_assert.h"
enum ABError {
AB_ERROR_OK,
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/3fe162d5/proxy/ControlBase.h
----------------------------------------------------------------------
diff --git a/proxy/ControlBase.h b/proxy/ControlBase.h
index 5c69a69..7fa979f 100644
--- a/proxy/ControlBase.h
+++ b/proxy/ControlBase.h
@@ -33,7 +33,8 @@
#ifndef _CONTROL_BASE_H_
#define _CONTROL_BASE_H_
-#include "ts/libts.h"
+#include "ts/ink_platform.h"
+#include "ts/Vec.h"
class HttpRequestData;
class Tokenizer;
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/3fe162d5/proxy/ControlMatcher.cc
----------------------------------------------------------------------
diff --git a/proxy/ControlMatcher.cc b/proxy/ControlMatcher.cc
index fa4c71d..5d13a7d 100644
--- a/proxy/ControlMatcher.cc
+++ b/proxy/ControlMatcher.cc
@@ -28,8 +28,10 @@
*
****************************************************************************/
-#include "ts/ink_config.h"
#include <sys/types.h>
+
+#include "ts/ink_config.h"
+#include "ts/MatcherUtils.h"
#include "Main.h"
#include "ProxyConfig.h"
#include "ControlMatcher.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/3fe162d5/proxy/ControlMatcher.h
----------------------------------------------------------------------
diff --git a/proxy/ControlMatcher.h b/proxy/ControlMatcher.h
index 7a75b8f..57562a8 100644
--- a/proxy/ControlMatcher.h
+++ b/proxy/ControlMatcher.h
@@ -88,7 +88,8 @@
#define _CONTROL_MATCHER_H_
#include "ts/DynArray.h"
-#include <ts/IpMap.h>
+#include "ts/ink_hash_table.h"
+#include "ts/IpMap.h"
#include "ts/ink_apidefs.h"
#include "ts/ink_defs.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/3fe162d5/proxy/CoreUtils.cc
----------------------------------------------------------------------
diff --git a/proxy/CoreUtils.cc b/proxy/CoreUtils.cc
index f4cce46..741bff7 100644
--- a/proxy/CoreUtils.cc
+++ b/proxy/CoreUtils.cc
@@ -105,7 +105,7 @@ int program_counter = 0;
#include <stdlib.h>
#include <stdint.h>
#include <math.h>
-#include "ts/libts.h"
+#include "ts/ink_platform.h"
#include "CoreUtils.h"
#endif /* darwin || freebsd || solaris */
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/3fe162d5/proxy/ICP.cc
----------------------------------------------------------------------
diff --git a/proxy/ICP.cc b/proxy/ICP.cc
index 57a2fb2..4f3c768 100644
--- a/proxy/ICP.cc
+++ b/proxy/ICP.cc
@@ -28,7 +28,7 @@
****************************************************************************/
-#include "ts/libts.h"
+#include "ts/ink_platform.h"
#include "Main.h"
#include "P_EventSystem.h"
#include "P_Cache.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/3fe162d5/proxy/ICPConfig.cc
----------------------------------------------------------------------
diff --git a/proxy/ICPConfig.cc b/proxy/ICPConfig.cc
index f7eb257..e6ed78b 100644
--- a/proxy/ICPConfig.cc
+++ b/proxy/ICPConfig.cc
@@ -28,7 +28,7 @@
****************************************************************************/
-#include "ts/libts.h"
+#include "ts/ink_platform.h"
#include "P_EventSystem.h"
#include "P_Cache.h"
#include "P_Net.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/3fe162d5/proxy/IPAllow.cc
----------------------------------------------------------------------
diff --git a/proxy/IPAllow.cc b/proxy/IPAllow.cc
index 6f414cf..20c36d9 100644
--- a/proxy/IPAllow.cc
+++ b/proxy/IPAllow.cc
@@ -28,7 +28,7 @@
*
****************************************************************************/
-#include "ts/libts.h"
+#include "ts/ink_platform.h"
#include "Main.h"
#include "IPAllow.h"
#include "ProxyConfig.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/3fe162d5/proxy/InkAPI.cc
----------------------------------------------------------------------
diff --git a/proxy/InkAPI.cc b/proxy/InkAPI.cc
index 069fcb6..5e3c0f8 100644
--- a/proxy/InkAPI.cc
+++ b/proxy/InkAPI.cc
@@ -23,7 +23,7 @@
#include <stdio.h>
-#include "ts/libts.h"
+#include "ts/ink_platform.h"
#include "ts/I_Layout.h"
#include "ts.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/3fe162d5/proxy/InkIOCoreAPI.cc
----------------------------------------------------------------------
diff --git a/proxy/InkIOCoreAPI.cc b/proxy/InkIOCoreAPI.cc
index a2e86e0..5ea27b4 100644
--- a/proxy/InkIOCoreAPI.cc
+++ b/proxy/InkIOCoreAPI.cc
@@ -27,7 +27,7 @@
* file to ensure that it gets exported as a global symbol in TS
*/
-#include "ts/libts.h"
+#include "ts/ink_platform.h"
#include "api/ts/InkAPIPrivateIOCore.h"
#if defined(solaris) && !defined(__GNUC__)
#include "P_EventSystem.h" // I_EventSystem.h
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/3fe162d5/proxy/Main.cc
----------------------------------------------------------------------
diff --git a/proxy/Main.cc b/proxy/Main.cc
index 49a01f3..0f402dd 100644
--- a/proxy/Main.cc
+++ b/proxy/Main.cc
@@ -32,7 +32,7 @@
#include "ts/ink_config.h"
-#include "ts/libts.h"
+#include "ts/ink_platform.h"
#include "ts/ink_sys_control.h"
#include <syslog.h>
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/3fe162d5/proxy/Main.h
----------------------------------------------------------------------
diff --git a/proxy/Main.h b/proxy/Main.h
index 278206b..b2ae0ad 100644
--- a/proxy/Main.h
+++ b/proxy/Main.h
@@ -23,8 +23,9 @@
#ifndef _Main_h_
#define _Main_h_
+#include "ts/ink_platform.h"
+#include "ts/ink_apidefs.h"
#include <ts/ink_defs.h>
-#include "ts/libts.h"
#include "ts/Regression.h"
#include "ts/I_Version.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/3fe162d5/proxy/ParentSelection.cc
----------------------------------------------------------------------
diff --git a/proxy/ParentSelection.cc b/proxy/ParentSelection.cc
index 5d63861..b8e432c 100644
--- a/proxy/ParentSelection.cc
+++ b/proxy/ParentSelection.cc
@@ -20,7 +20,7 @@
See the License for the specific language governing permissions and
limitations under the License.
*/
-#include "ts/libts.h"
+#include "ts/ink_platform.h"
#include "P_EventSystem.h"
#include "ParentSelection.h"
#include "ControlMatcher.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/3fe162d5/proxy/ParentSelection.h
----------------------------------------------------------------------
diff --git a/proxy/ParentSelection.h b/proxy/ParentSelection.h
index 51d21ed..e25b38e 100644
--- a/proxy/ParentSelection.h
+++ b/proxy/ParentSelection.h
@@ -40,7 +40,7 @@
#include "P_RecProcess.h"
-#include "ts/libts.h"
+#include "ts/ink_platform.h"
#define MAX_PARENTS 64
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/3fe162d5/proxy/ProxyClientSession.h
----------------------------------------------------------------------
diff --git a/proxy/ProxyClientSession.h b/proxy/ProxyClientSession.h
index c1ba124..ca02d19 100644
--- a/proxy/ProxyClientSession.h
+++ b/proxy/ProxyClientSession.h
@@ -24,7 +24,7 @@
#ifndef __PROXY_CLIENT_SESSION_H__
#define __PROXY_CLIENT_SESSION_H__
-#include "ts/libts.h"
+#include "ts/ink_platform.h"
#include "P_Net.h"
#include "InkAPIInternal.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/3fe162d5/proxy/ReverseProxy.cc
----------------------------------------------------------------------
diff --git a/proxy/ReverseProxy.cc b/proxy/ReverseProxy.cc
index 68d3e8a..7a60af2 100644
--- a/proxy/ReverseProxy.cc
+++ b/proxy/ReverseProxy.cc
@@ -27,7 +27,7 @@
*/
-#include "ts/libts.h"
+#include "ts/ink_platform.h"
#include <dlfcn.h>
#include "Main.h"
#include "Error.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/3fe162d5/proxy/SocksProxy.cc
----------------------------------------------------------------------
diff --git a/proxy/SocksProxy.cc b/proxy/SocksProxy.cc
index 94787a9..9d8d48b 100644
--- a/proxy/SocksProxy.cc
+++ b/proxy/SocksProxy.cc
@@ -27,7 +27,7 @@
*/
-#include "ts/libts.h"
+#include "ts/ink_platform.h"
#include "StatSystem.h"
#include "P_Net.h"
#include "I_OneWayTunnel.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/3fe162d5/proxy/StatSystem.h
----------------------------------------------------------------------
diff --git a/proxy/StatSystem.h b/proxy/StatSystem.h
index 61c39de..b23a1bb 100644
--- a/proxy/StatSystem.h
+++ b/proxy/StatSystem.h
@@ -30,8 +30,10 @@
#define _StatSystem_h_
#include "ts/ink_platform.h"
+#include "ts/ink_memory.h"
#include "ts/ink_hrtime.h"
#include "ts/ink_atomic.h"
+
#ifdef USE_LOCKS_FOR_DYN_STATS
#include "Lock.h"
#endif
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/3fe162d5/proxy/TestClusterHash.cc
----------------------------------------------------------------------
diff --git a/proxy/TestClusterHash.cc b/proxy/TestClusterHash.cc
index 93e65b9..22cf606 100644
--- a/proxy/TestClusterHash.cc
+++ b/proxy/TestClusterHash.cc
@@ -26,7 +26,7 @@
TestClusterHash.cc
****************************************************************************/
#include "Cluster.h"
-#include "ts/libts.h"
+#include "ts/ink_platform.h"
//
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/3fe162d5/proxy/TestDNS.cc
----------------------------------------------------------------------
diff --git a/proxy/TestDNS.cc b/proxy/TestDNS.cc
index f81301f..21cc8b2 100644
--- a/proxy/TestDNS.cc
+++ b/proxy/TestDNS.cc
@@ -38,7 +38,7 @@
#include <string.h>
#include "VConnection.h"
#include "stdio.h"
-#include "ts/libts.h"
+#include "ts/ink_platform.h"
#define N_STATE_MACHINES 1000
#define MEASUREMENT_INTERVAL 100
class TestDnsStateMachine;
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/3fe162d5/proxy/congest/Congestion.cc
----------------------------------------------------------------------
diff --git a/proxy/congest/Congestion.cc b/proxy/congest/Congestion.cc
index 0bbeeac..28bb2eb 100644
--- a/proxy/congest/Congestion.cc
+++ b/proxy/congest/Congestion.cc
@@ -27,7 +27,7 @@
*
*
****************************************************************************/
-#include "ts/libts.h"
+#include "ts/ink_platform.h"
#include "I_Net.h"
#include "CongestionDB.h"
#include "Congestion.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/3fe162d5/proxy/congest/Congestion.h
----------------------------------------------------------------------
diff --git a/proxy/congest/Congestion.h b/proxy/congest/Congestion.h
index de964e6..e792837 100644
--- a/proxy/congest/Congestion.h
+++ b/proxy/congest/Congestion.h
@@ -31,7 +31,7 @@
#ifndef CONGESTION_H_
#define CONGESTION_H_
-#include "ts/libts.h"
+#include "ts/ink_platform.h"
#include "P_EventSystem.h"
#include "ControlBase.h"
#include "ControlMatcher.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/3fe162d5/proxy/congest/CongestionDB.cc
----------------------------------------------------------------------
diff --git a/proxy/congest/CongestionDB.cc b/proxy/congest/CongestionDB.cc
index bb0035c..3015f0f 100644
--- a/proxy/congest/CongestionDB.cc
+++ b/proxy/congest/CongestionDB.cc
@@ -27,7 +27,7 @@
*
*
****************************************************************************/
-#include "ts/libts.h"
+#include "ts/ink_platform.h"
#include "P_EventSystem.h"
#include "P_Net.h"
#include "Main.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/3fe162d5/proxy/congest/CongestionTest.cc
----------------------------------------------------------------------
diff --git a/proxy/congest/CongestionTest.cc b/proxy/congest/CongestionTest.cc
index 819fb63..1e0dcb8 100644
--- a/proxy/congest/CongestionTest.cc
+++ b/proxy/congest/CongestionTest.cc
@@ -27,7 +27,7 @@
*
*
****************************************************************************/
-#include "ts/libts.h"
+#include "ts/ink_platform.h"
#include <math.h>
#include "Main.h"
#include "CongestionDB.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/3fe162d5/proxy/hdrs/HTTP.cc
----------------------------------------------------------------------
diff --git a/proxy/hdrs/HTTP.cc b/proxy/hdrs/HTTP.cc
index 78e7161..3a3d067 100644
--- a/proxy/hdrs/HTTP.cc
+++ b/proxy/hdrs/HTTP.cc
@@ -22,7 +22,9 @@
*/
#include "ts/ink_defs.h"
-#include "ts/libts.h"
+#include "ts/ink_platform.h"
+#include "ts/TsBuffer.h"
+#include "ts/ink_inet.h"
#include <assert.h>
#include <stdio.h>
#include <string.h>
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/3fe162d5/proxy/hdrs/HdrHeap.cc
----------------------------------------------------------------------
diff --git a/proxy/hdrs/HdrHeap.cc b/proxy/hdrs/HdrHeap.cc
index ba381b7..f730c0f 100644
--- a/proxy/hdrs/HdrHeap.cc
+++ b/proxy/hdrs/HdrHeap.cc
@@ -30,7 +30,7 @@
****************************************************************************/
-#include "ts/libts.h"
+#include "ts/ink_platform.h"
#include "HdrHeap.h"
#include "URL.h"
#include "MIME.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/3fe162d5/proxy/hdrs/HdrTSOnly.cc
----------------------------------------------------------------------
diff --git a/proxy/hdrs/HdrTSOnly.cc b/proxy/hdrs/HdrTSOnly.cc
index 686ee13..08705d2 100644
--- a/proxy/hdrs/HdrTSOnly.cc
+++ b/proxy/hdrs/HdrTSOnly.cc
@@ -37,7 +37,7 @@
****************************************************************************/
-#include "ts/libts.h"
+#include "ts/ink_platform.h"
#include "HTTP.h"
#include "P_EventSystem.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/3fe162d5/proxy/hdrs/HdrTest.cc
----------------------------------------------------------------------
diff --git a/proxy/hdrs/HdrTest.cc b/proxy/hdrs/HdrTest.cc
index ec1d672..368241f 100644
--- a/proxy/hdrs/HdrTest.cc
+++ b/proxy/hdrs/HdrTest.cc
@@ -32,7 +32,9 @@
****************************************************************************/
-#include "ts/libts.h"
+#include "ts/ink_platform.h"
+#include "ts/ink_memory.h"
+#include "ts/ink_time.h"
#include "ts/Arena.h"
#include "HTTP.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/3fe162d5/proxy/hdrs/HdrToken.cc
----------------------------------------------------------------------
diff --git a/proxy/hdrs/HdrToken.cc b/proxy/hdrs/HdrToken.cc
index 8d292ed..a2f1c29 100644
--- a/proxy/hdrs/HdrToken.cc
+++ b/proxy/hdrs/HdrToken.cc
@@ -21,7 +21,10 @@
limitations under the License.
*/
-#include "ts/libts.h"
+#include "ts/ink_platform.h"
+#include "ts/HashFNV.h"
+#include "ts/Diags.h"
+#include "ts/ink_memory.h"
#include <stdio.h>
#include "ts/Allocator.h"
#include "HTTP.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/3fe162d5/proxy/hdrs/HdrUtils.cc
----------------------------------------------------------------------
diff --git a/proxy/hdrs/HdrUtils.cc b/proxy/hdrs/HdrUtils.cc
index 9266498..8285c76 100644
--- a/proxy/hdrs/HdrUtils.cc
+++ b/proxy/hdrs/HdrUtils.cc
@@ -31,7 +31,7 @@
****************************************************************************/
-#include "ts/libts.h"
+#include "ts/ink_platform.h"
#include "HdrUtils.h"
#define GETNEXT() \
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/3fe162d5/proxy/hdrs/HttpCompat.cc
----------------------------------------------------------------------
diff --git a/proxy/hdrs/HttpCompat.cc b/proxy/hdrs/HttpCompat.cc
index 4ccfd65..f60b476 100644
--- a/proxy/hdrs/HttpCompat.cc
+++ b/proxy/hdrs/HttpCompat.cc
@@ -21,7 +21,7 @@
limitations under the License.
*/
-#include "ts/libts.h"
+#include "ts/ink_platform.h"
#include "HttpCompat.h"
#include "HdrUtils.h" /* MAGIC_EDITING_TAG */
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/3fe162d5/proxy/hdrs/MIME.cc
----------------------------------------------------------------------
diff --git a/proxy/hdrs/MIME.cc b/proxy/hdrs/MIME.cc
index af989f3..2907d35 100644
--- a/proxy/hdrs/MIME.cc
+++ b/proxy/hdrs/MIME.cc
@@ -22,7 +22,9 @@
*/
#include "ts/ink_defs.h"
-#include "ts/libts.h"
+#include "ts/ink_platform.h"
+#include "ts/ink_memory.h"
+#include "ts/TsBuffer.h"
#include <assert.h>
#include <stdio.h>
#include <string.h>
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/3fe162d5/proxy/hdrs/URL.cc
----------------------------------------------------------------------
diff --git a/proxy/hdrs/URL.cc b/proxy/hdrs/URL.cc
index 430e83a..2eb4181 100644
--- a/proxy/hdrs/URL.cc
+++ b/proxy/hdrs/URL.cc
@@ -23,7 +23,9 @@
#include <assert.h>
#include <new>
-#include "ts/libts.h"
+#include "ts/ink_platform.h"
+#include "ts/ink_memory.h"
+#include "ts/TsBuffer.h"
#include "URL.h"
#include "MIME.h"
#include "HTTP.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/3fe162d5/proxy/http/HttpBodyFactory.cc
----------------------------------------------------------------------
diff --git a/proxy/http/HttpBodyFactory.cc b/proxy/http/HttpBodyFactory.cc
index 4482d5e..0d01139 100644
--- a/proxy/http/HttpBodyFactory.cc
+++ b/proxy/http/HttpBodyFactory.cc
@@ -28,7 +28,7 @@
****************************************************************************/
-#include "ts/libts.h"
+#include "ts/ink_platform.h"
#include "HttpBodyFactory.h"
#include <unistd.h>
#include <dirent.h>
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/3fe162d5/proxy/http/HttpBodyFactory.h
----------------------------------------------------------------------
diff --git a/proxy/http/HttpBodyFactory.h b/proxy/http/HttpBodyFactory.h
index bcafcbc..110b0df 100644
--- a/proxy/http/HttpBodyFactory.h
+++ b/proxy/http/HttpBodyFactory.h
@@ -57,7 +57,7 @@
#include <strings.h>
#include <sys/types.h>
-#include "ts/libts.h"
+#include "ts/ink_platform.h"
#include "HTTP.h"
#include "HttpConfig.h"
#include "HttpCompat.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/3fe162d5/proxy/http/HttpClientSession.h
----------------------------------------------------------------------
diff --git a/proxy/http/HttpClientSession.h b/proxy/http/HttpClientSession.h
index 7f8c118..6f4c885 100644
--- a/proxy/http/HttpClientSession.h
+++ b/proxy/http/HttpClientSession.h
@@ -32,7 +32,7 @@
#ifndef _HTTP_CLIENT_SESSION_H_
#define _HTTP_CLIENT_SESSION_H_
-#include "ts/libts.h"
+#include "ts/ink_platform.h"
#include "P_Net.h"
#include "InkAPIInternal.h"
#include "HTTP.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/3fe162d5/proxy/http/HttpConfig.h
----------------------------------------------------------------------
diff --git a/proxy/http/HttpConfig.h b/proxy/http/HttpConfig.h
index 2d93f70..085136c 100644
--- a/proxy/http/HttpConfig.h
+++ b/proxy/http/HttpConfig.h
@@ -41,7 +41,7 @@
#include <ctype.h>
#endif
-#include "ts/libts.h"
+#include "ts/ink_platform.h"
#include "ts/Regex.h"
#include "HttpProxyAPIEnums.h"
#include "ProxyConfig.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/3fe162d5/proxy/http/HttpConnectionCount.h
----------------------------------------------------------------------
diff --git a/proxy/http/HttpConnectionCount.h b/proxy/http/HttpConnectionCount.h
index d725ca0..25783aa 100644
--- a/proxy/http/HttpConnectionCount.h
+++ b/proxy/http/HttpConnectionCount.h
@@ -22,7 +22,9 @@
*/
//
-#include "ts/libts.h"
+#include "ts/ink_platform.h"
+#include "ts/ink_inet.h"
+#include "ts/ink_mutex.h"
#include "ts/Map.h"
#ifndef _HTTP_CONNECTION_COUNT_H_
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/3fe162d5/proxy/http/HttpSM.h
----------------------------------------------------------------------
diff --git a/proxy/http/HttpSM.h b/proxy/http/HttpSM.h
index 504ccdd..38e7bac 100644
--- a/proxy/http/HttpSM.h
+++ b/proxy/http/HttpSM.h
@@ -33,7 +33,7 @@
#ifndef _HTTP_SM_H_
#define _HTTP_SM_H_
-#include "ts/libts.h"
+#include "ts/ink_platform.h"
#include "P_EventSystem.h"
#include "HttpCacheSM.h"
#include "HttpTransact.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/3fe162d5/proxy/http/HttpSessionAccept.h
----------------------------------------------------------------------
diff --git a/proxy/http/HttpSessionAccept.h b/proxy/http/HttpSessionAccept.h
index d368065..43abffc 100644
--- a/proxy/http/HttpSessionAccept.h
+++ b/proxy/http/HttpSessionAccept.h
@@ -24,7 +24,7 @@
#if !defined(_HttpSessionAccept_h_)
#define _HttpSessionAccept_h_
-#include "ts/libts.h"
+#include "ts/ink_platform.h"
#include "records/I_RecHttp.h"
#include "P_EventSystem.h"
#include "HttpConfig.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/3fe162d5/proxy/http/HttpTransact.cc
----------------------------------------------------------------------
diff --git a/proxy/http/HttpTransact.cc b/proxy/http/HttpTransact.cc
index ff92198..b63f8bc 100644
--- a/proxy/http/HttpTransact.cc
+++ b/proxy/http/HttpTransact.cc
@@ -21,7 +21,7 @@
limitations under the License.
*/
-#include "ts/libts.h"
+#include "ts/ink_platform.h"
#include <strings.h>
#include <math.h>
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/3fe162d5/proxy/http/HttpTransact.h
----------------------------------------------------------------------
diff --git a/proxy/http/HttpTransact.h b/proxy/http/HttpTransact.h
index 199c600..e2deecc 100644
--- a/proxy/http/HttpTransact.h
+++ b/proxy/http/HttpTransact.h
@@ -25,7 +25,7 @@
#if !defined(_HttpTransact_h_)
#define _HttpTransact_h_
-#include "ts/libts.h"
+#include "ts/ink_platform.h"
#include "P_HostDB.h"
#include "P_Net.h"
#include "HttpConfig.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/3fe162d5/proxy/http/HttpTransactCache.cc
----------------------------------------------------------------------
diff --git a/proxy/http/HttpTransactCache.cc b/proxy/http/HttpTransactCache.cc
index 8317b24..35e5f61 100644
--- a/proxy/http/HttpTransactCache.cc
+++ b/proxy/http/HttpTransactCache.cc
@@ -21,7 +21,7 @@
limitations under the License.
*/
-#include "ts/libts.h"
+#include "ts/ink_platform.h"
#include "HttpTransact.h"
#include "HttpTransactHeaders.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/3fe162d5/proxy/http/HttpTransactCache.h
----------------------------------------------------------------------
diff --git a/proxy/http/HttpTransactCache.h b/proxy/http/HttpTransactCache.h
index d78e141..7f20b59 100644
--- a/proxy/http/HttpTransactCache.h
+++ b/proxy/http/HttpTransactCache.h
@@ -31,7 +31,7 @@
#if !defined(_HttpTransactCache_h_)
#define _HttpTransactCache_h_
-#include "ts/libts.h"
+#include "ts/ink_platform.h"
// This is needed since txn_conf->cache_guaranteed_max_lifetime is currently not
// readily available in the cache. ToDo: We should fix this with TS-1919
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/3fe162d5/proxy/http/HttpTransactHeaders.cc
----------------------------------------------------------------------
diff --git a/proxy/http/HttpTransactHeaders.cc b/proxy/http/HttpTransactHeaders.cc
index a0d56a3..d0ca6fd 100644
--- a/proxy/http/HttpTransactHeaders.cc
+++ b/proxy/http/HttpTransactHeaders.cc
@@ -20,7 +20,7 @@
See the License for the specific language governing permissions and
limitations under the License.
*/
-#include "ts/libts.h"
+#include "ts/ink_platform.h"
#include "HttpTransact.h"
#include "HttpTransactHeaders.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/3fe162d5/proxy/http/HttpTunnel.h
----------------------------------------------------------------------
diff --git a/proxy/http/HttpTunnel.h b/proxy/http/HttpTunnel.h
index 615e386..2534665 100644
--- a/proxy/http/HttpTunnel.h
+++ b/proxy/http/HttpTunnel.h
@@ -33,7 +33,7 @@
#ifndef _HTTP_TUNNEL_H_
#define _HTTP_TUNNEL_H_
-#include "ts/libts.h"
+#include "ts/ink_platform.h"
#include "P_EventSystem.h"
// Get rid of any previous definition first... /leif
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/3fe162d5/proxy/http/remap/AclFiltering.h
----------------------------------------------------------------------
diff --git a/proxy/http/remap/AclFiltering.h b/proxy/http/remap/AclFiltering.h
index 6e2c614..ef04f9c 100644
--- a/proxy/http/remap/AclFiltering.h
+++ b/proxy/http/remap/AclFiltering.h
@@ -25,7 +25,7 @@
#define _ACL_FILTERING_H_
#include "Main.h"
-//#include "YAddr.h"
+#include "ts/ink_inet.h"
#include <string>
#include <set>
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/3fe162d5/proxy/http/remap/RemapConfig.cc
----------------------------------------------------------------------
diff --git a/proxy/http/remap/RemapConfig.cc b/proxy/http/remap/RemapConfig.cc
index 512bc9d..7152b6e 100644
--- a/proxy/http/remap/RemapConfig.cc
+++ b/proxy/http/remap/RemapConfig.cc
@@ -26,7 +26,8 @@
#include "ReverseProxy.h"
#include "ts/I_Layout.h"
#include "HTTP.h"
-#include "ts/libts.h"
+#include "ts/ink_platform.h"
+#include "ts/List.h"
#include "ts/ink_cap.h"
#include "ts/ink_file.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/3fe162d5/proxy/http/remap/RemapPluginInfo.cc
----------------------------------------------------------------------
diff --git a/proxy/http/remap/RemapPluginInfo.cc b/proxy/http/remap/RemapPluginInfo.cc
index e7c0d7b..c47870d 100644
--- a/proxy/http/remap/RemapPluginInfo.cc
+++ b/proxy/http/remap/RemapPluginInfo.cc
@@ -22,6 +22,8 @@
*/
#include "RemapPluginInfo.h"
+#include "ts/ink_string.h"
+#include "ts/ink_memory.h"
remap_plugin_info::remap_plugin_info(char *_path)
: next(0), path(NULL), path_size(0), dlh(NULL), fp_tsremap_init(NULL), fp_tsremap_done(NULL), fp_tsremap_new_instance(NULL),
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/3fe162d5/proxy/http/remap/RemapPluginInfo.h
----------------------------------------------------------------------
diff --git a/proxy/http/remap/RemapPluginInfo.h b/proxy/http/remap/RemapPluginInfo.h
index 3783fd3..6b61df9 100644
--- a/proxy/http/remap/RemapPluginInfo.h
+++ b/proxy/http/remap/RemapPluginInfo.h
@@ -23,7 +23,7 @@
#if !defined(_REMAPPLUGININFO_h_)
#define _REMAPPLUGININFO_h_
-#include "ts/libts.h"
+#include "ts/ink_platform.h"
#include "api/ts/ts.h"
#include "api/ts/remap.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/3fe162d5/proxy/http/remap/RemapPlugins.h
----------------------------------------------------------------------
diff --git a/proxy/http/remap/RemapPlugins.h b/proxy/http/remap/RemapPlugins.h
index 7eade67..4329ca5 100644
--- a/proxy/http/remap/RemapPlugins.h
+++ b/proxy/http/remap/RemapPlugins.h
@@ -28,7 +28,7 @@
#if !defined(_REMAPPLUGINS_h_)
#define _REMAPPLUGINS_h_
-#include "ts/libts.h"
+#include "ts/ink_platform.h"
#include "I_EventSystem.h"
#include "RemapProcessor.h"
#include "api/ts/ts.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/3fe162d5/proxy/http/remap/UrlMapping.h
----------------------------------------------------------------------
diff --git a/proxy/http/remap/UrlMapping.h b/proxy/http/remap/UrlMapping.h
index 88791e6..f86744c 100644
--- a/proxy/http/remap/UrlMapping.h
+++ b/proxy/http/remap/UrlMapping.h
@@ -31,6 +31,7 @@
#include "URL.h"
#include "RemapPluginInfo.h"
#include "ts/Regex.h"
+#include "ts/List.h"
static const unsigned int MAX_REMAP_PLUGIN_CHAIN = 10;
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/3fe162d5/proxy/http/remap/UrlMappingPathIndex.h
----------------------------------------------------------------------
diff --git a/proxy/http/remap/UrlMappingPathIndex.h b/proxy/http/remap/UrlMappingPathIndex.h
index a634ded..e7fe804 100644
--- a/proxy/http/remap/UrlMappingPathIndex.h
+++ b/proxy/http/remap/UrlMappingPathIndex.h
@@ -23,7 +23,7 @@
#ifndef _URL_MAPPING_PATH_INDEX_H
#define _URL_MAPPING_PATH_INDEX_H
-#include "ts/libts.h"
+#include "ts/ink_platform.h"
#undef std // FIXME: remove dependancy on the STL
#include <map>
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/3fe162d5/proxy/http2/HPACK.h
----------------------------------------------------------------------
diff --git a/proxy/http2/HPACK.h b/proxy/http2/HPACK.h
index aec28bb..3550495 100644
--- a/proxy/http2/HPACK.h
+++ b/proxy/http2/HPACK.h
@@ -24,7 +24,9 @@
#ifndef __HPACK_H__
#define __HPACK_H__
-#include "ts/libts.h"
+#include "ts/ink_platform.h"
+#include "ts/Vec.h"
+#include "ts/Diags.h"
#include "HTTP.h"
// Constant strings for pseudo headers of HPACK
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/3fe162d5/proxy/http2/Http2SessionAccept.h
----------------------------------------------------------------------
diff --git a/proxy/http2/Http2SessionAccept.h b/proxy/http2/Http2SessionAccept.h
index 3d9ba22..8df082d 100644
--- a/proxy/http2/Http2SessionAccept.h
+++ b/proxy/http2/Http2SessionAccept.h
@@ -24,7 +24,7 @@
#ifndef __HTTP2_SESSION_ACCEPT_H__
#define __HTTP2_SESSION_ACCEPT_H__
-#include "ts/libts.h"
+#include "ts/ink_platform.h"
#include "I_Net.h"
// XXX HttpSessionAccept::Options needs to be refactored and separated from HttpSessionAccept so that
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/3fe162d5/proxy/http2/HuffmanCodec.cc
----------------------------------------------------------------------
diff --git a/proxy/http2/HuffmanCodec.cc b/proxy/http2/HuffmanCodec.cc
index 08d4717..0816d49 100644
--- a/proxy/http2/HuffmanCodec.cc
+++ b/proxy/http2/HuffmanCodec.cc
@@ -22,7 +22,9 @@
*/
#include "HuffmanCodec.h"
-#include "ts/libts.h"
+#include "ts/ink_platform.h"
+#include "ts/ink_memory.h"
+#include "ts/ink_defs.h"
struct huffman_entry {
uint32_t code_as_hex;
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/3fe162d5/proxy/logging/Log.cc
----------------------------------------------------------------------
diff --git a/proxy/logging/Log.cc b/proxy/logging/Log.cc
index 1c8cc25..01921f4 100644
--- a/proxy/logging/Log.cc
+++ b/proxy/logging/Log.cc
@@ -32,7 +32,7 @@
class.
***************************************************************************/
-#include "ts/libts.h"
+#include "ts/ink_platform.h"
#include "Error.h"
#include "Main.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/3fe162d5/proxy/logging/Log.h
----------------------------------------------------------------------
diff --git a/proxy/logging/Log.h b/proxy/logging/Log.h
index 552a8db..672ac2e 100644
--- a/proxy/logging/Log.h
+++ b/proxy/logging/Log.h
@@ -294,7 +294,7 @@
#define LOG_H
#include <stdarg.h>
-#include "ts/libts.h"
+#include "ts/ink_platform.h"
#include "P_RecProcess.h"
#include "LogFile.h"
#include "LogBuffer.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/3fe162d5/proxy/logging/LogAccess.cc
----------------------------------------------------------------------
diff --git a/proxy/logging/LogAccess.cc b/proxy/logging/LogAccess.cc
index 0e66493..bea3b1b 100644
--- a/proxy/logging/LogAccess.cc
+++ b/proxy/logging/LogAccess.cc
@@ -31,7 +31,7 @@
to provide support for marshalling and unmarshalling support for the other
LogAccess derived classes.
*/
-#include "ts/libts.h"
+#include "ts/ink_platform.h"
#include "Error.h"
#include "HTTP.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/3fe162d5/proxy/logging/LogAccess.h
----------------------------------------------------------------------
diff --git a/proxy/logging/LogAccess.h b/proxy/logging/LogAccess.h
index c9c176d..143aedf 100644
--- a/proxy/logging/LogAccess.h
+++ b/proxy/logging/LogAccess.h
@@ -28,7 +28,9 @@
***************************************************************************/
#ifndef LOG_ACCESS_H
#define LOG_ACCESS_H
-#include "ts/libts.h"
+#include "ts/ink_platform.h"
+#include "ts/ink_inet.h"
+#include "ts/ink_align.h"
#include "LogField.h"
/*-------------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/3fe162d5/proxy/logging/LogAccessHttp.cc
----------------------------------------------------------------------
diff --git a/proxy/logging/LogAccessHttp.cc b/proxy/logging/LogAccessHttp.cc
index de9ec73..8d457ab 100644
--- a/proxy/logging/LogAccessHttp.cc
+++ b/proxy/logging/LogAccessHttp.cc
@@ -30,7 +30,7 @@
***************************************************************************/
-#include "ts/libts.h"
+#include "ts/ink_platform.h"
#include "Error.h"
#include "LogAccessHttp.h"
#include "http/HttpSM.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/3fe162d5/proxy/logging/LogAccessICP.cc
----------------------------------------------------------------------
diff --git a/proxy/logging/LogAccessICP.cc b/proxy/logging/LogAccessICP.cc
index 9cf31ba..3890051 100644
--- a/proxy/logging/LogAccessICP.cc
+++ b/proxy/logging/LogAccessICP.cc
@@ -31,7 +31,7 @@
***************************************************************************/
-#include "ts/libts.h"
+#include "ts/ink_platform.h"
#include "Error.h"
#include "HTTP.h"
#include "ICP.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/3fe162d5/proxy/logging/LogBuffer.cc
----------------------------------------------------------------------
diff --git a/proxy/logging/LogBuffer.cc b/proxy/logging/LogBuffer.cc
index 2e03c3b..a538de1 100644
--- a/proxy/logging/LogBuffer.cc
+++ b/proxy/logging/LogBuffer.cc
@@ -25,7 +25,7 @@
recording log entries. See the header file LogBuffer.h for more
information on the structure of a LogBuffer.
*/
-#include "ts/libts.h"
+#include "ts/ink_platform.h"
#include <stdio.h>
#include <stdlib.h>
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/3fe162d5/proxy/logging/LogBuffer.h
----------------------------------------------------------------------
diff --git a/proxy/logging/LogBuffer.h b/proxy/logging/LogBuffer.h
index 8463f64..d7c24d4 100644
--- a/proxy/logging/LogBuffer.h
+++ b/proxy/logging/LogBuffer.h
@@ -25,7 +25,7 @@
#ifndef LOG_BUFFER_H
#define LOG_BUFFER_H
-#include "ts/libts.h"
+#include "ts/ink_platform.h"
#include "LogFormat.h"
#include "LogLimits.h"
#include "LogAccess.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/3fe162d5/proxy/logging/LogCollationAccept.cc
----------------------------------------------------------------------
diff --git a/proxy/logging/LogCollationAccept.cc b/proxy/logging/LogCollationAccept.cc
index 0dedc92..525c9ed 100644
--- a/proxy/logging/LogCollationAccept.cc
+++ b/proxy/logging/LogCollationAccept.cc
@@ -25,7 +25,7 @@
// include files
//-------------------------------------------------------------------------
-#include "ts/libts.h"
+#include "ts/ink_platform.h"
#include "P_EventSystem.h"
#include "Log.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/3fe162d5/proxy/logging/LogCollationClientSM.cc
----------------------------------------------------------------------
diff --git a/proxy/logging/LogCollationClientSM.cc b/proxy/logging/LogCollationClientSM.cc
index ac00aa0..34185f4 100644
--- a/proxy/logging/LogCollationClientSM.cc
+++ b/proxy/logging/LogCollationClientSM.cc
@@ -25,7 +25,7 @@
// include files
//-------------------------------------------------------------------------
-#include "ts/libts.h"
+#include "ts/ink_platform.h"
#include <stdio.h>
#include <stdlib.h>
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/3fe162d5/proxy/logging/LogConfig.cc
----------------------------------------------------------------------
diff --git a/proxy/logging/LogConfig.cc b/proxy/logging/LogConfig.cc
index fdccf4c..aa5d160 100644
--- a/proxy/logging/LogConfig.cc
+++ b/proxy/logging/LogConfig.cc
@@ -21,7 +21,7 @@
limitations under the License.
*/
-#include "ts/libts.h"
+#include "ts/ink_platform.h"
#include "ts/I_Layout.h"
#ifdef HAVE_SYS_PARAM_H
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/3fe162d5/proxy/logging/LogConfig.h
----------------------------------------------------------------------
diff --git a/proxy/logging/LogConfig.h b/proxy/logging/LogConfig.h
index c7e18ac..424bffb 100644
--- a/proxy/logging/LogConfig.h
+++ b/proxy/logging/LogConfig.h
@@ -25,7 +25,7 @@
#ifndef LOG_CONFIG_H
#define LOG_CONFIG_H
-#include "ts/libts.h"
+#include "ts/ink_platform.h"
#include "P_RecProcess.h"
#include "ProxyConfig.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/3fe162d5/proxy/logging/LogField.cc
----------------------------------------------------------------------
diff --git a/proxy/logging/LogField.cc b/proxy/logging/LogField.cc
index 37008cd..d6d142b 100644
--- a/proxy/logging/LogField.cc
+++ b/proxy/logging/LogField.cc
@@ -27,7 +27,7 @@
This file implements the LogField object, which is the central
representation of a logging field.
***************************************************************************/
-#include "ts/libts.h"
+#include "ts/ink_platform.h"
#include "Error.h"
#include "LogUtils.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/3fe162d5/proxy/logging/LogField.h
----------------------------------------------------------------------
diff --git a/proxy/logging/LogField.h b/proxy/logging/LogField.h
index 27fad8e..b7cd5b9 100644
--- a/proxy/logging/LogField.h
+++ b/proxy/logging/LogField.h
@@ -25,7 +25,8 @@
#ifndef LOG_FIELD_H
#define LOG_FIELD_H
-#include "ts/libts.h"
+#include "ts/ink_platform.h"
+#include "ts/List.h"
#include "LogFieldAliasMap.h"
#include "StatSystem.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/3fe162d5/proxy/logging/LogFieldAliasMap.cc
----------------------------------------------------------------------
diff --git a/proxy/logging/LogFieldAliasMap.cc b/proxy/logging/LogFieldAliasMap.cc
index ad2d53c..c0ade1c 100644
--- a/proxy/logging/LogFieldAliasMap.cc
+++ b/proxy/logging/LogFieldAliasMap.cc
@@ -30,6 +30,7 @@
#include "ts/ink_config.h"
#include "LogFieldAliasMap.h"
#include "ts/ink_assert.h"
+#include "ts/ink_memory.h"
void
LogFieldAliasTable::init(size_t numPairs, ...)
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/3fe162d5/proxy/logging/LogFieldAliasMap.h
----------------------------------------------------------------------
diff --git a/proxy/logging/LogFieldAliasMap.h b/proxy/logging/LogFieldAliasMap.h
index 4df1e8d..9c631e1 100644
--- a/proxy/logging/LogFieldAliasMap.h
+++ b/proxy/logging/LogFieldAliasMap.h
@@ -33,7 +33,7 @@
#include <stdarg.h>
#include <string.h>
-#include "ts/libts.h"
+#include "ts/ink_platform.h"
#include "ts/Ptr.h"
#include "LogUtils.h"
#include "ts/ink_string.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/3fe162d5/proxy/logging/LogFile.cc
----------------------------------------------------------------------
diff --git a/proxy/logging/LogFile.cc b/proxy/logging/LogFile.cc
index 920e7be..8253d16 100644
--- a/proxy/logging/LogFile.cc
+++ b/proxy/logging/LogFile.cc
@@ -27,7 +27,7 @@
***************************************************************************/
-#include "ts/libts.h"
+#include "ts/ink_platform.h"
#include <errno.h>
#include <sys/types.h>
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/3fe162d5/proxy/logging/LogFile.h
----------------------------------------------------------------------
diff --git a/proxy/logging/LogFile.h b/proxy/logging/LogFile.h
index 1f127c2..6c6e761 100644
--- a/proxy/logging/LogFile.h
+++ b/proxy/logging/LogFile.h
@@ -28,7 +28,7 @@
#include <stdarg.h>
#include <stdio.h>
-#include "ts/libts.h"
+#include "ts/ink_platform.h"
#include "LogBufferSink.h"
class LogSock;
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/3fe162d5/proxy/logging/LogFilter.cc
----------------------------------------------------------------------
diff --git a/proxy/logging/LogFilter.cc b/proxy/logging/LogFilter.cc
index a266c1a..9bcc9da 100644
--- a/proxy/logging/LogFilter.cc
+++ b/proxy/logging/LogFilter.cc
@@ -26,7 +26,7 @@
***************************************************************************/
-#include "ts/libts.h"
+#include "ts/ink_platform.h"
#include "Error.h"
#include "LogUtils.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/3fe162d5/proxy/logging/LogFilter.h
----------------------------------------------------------------------
diff --git a/proxy/logging/LogFilter.h b/proxy/logging/LogFilter.h
index 7102bba..d252b20 100644
--- a/proxy/logging/LogFilter.h
+++ b/proxy/logging/LogFilter.h
@@ -25,7 +25,7 @@
#ifndef LOG_FILTER_H
#define LOG_FILTER_H
-#include "ts/libts.h"
+#include "ts/ink_platform.h"
#include "ts/IpMap.h"
#include "LogAccess.h"
#include "LogField.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/3fe162d5/proxy/logging/LogFormat.h
----------------------------------------------------------------------
diff --git a/proxy/logging/LogFormat.h b/proxy/logging/LogFormat.h
index e910ecc..2062c1a 100644
--- a/proxy/logging/LogFormat.h
+++ b/proxy/logging/LogFormat.h
@@ -26,7 +26,7 @@
#define LOG_FIELD_MARKER '\377'
-#include "ts/libts.h"
+#include "ts/ink_platform.h"
#include "LogField.h"
#include "InkXml.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/3fe162d5/proxy/logging/LogHost.cc
----------------------------------------------------------------------
diff --git a/proxy/logging/LogHost.cc b/proxy/logging/LogHost.cc
index 4767cc0..ad30128 100644
--- a/proxy/logging/LogHost.cc
+++ b/proxy/logging/LogHost.cc
@@ -26,7 +26,7 @@
***************************************************************************/
-#include "ts/libts.h"
+#include "ts/ink_platform.h"
#include "Error.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/3fe162d5/proxy/logging/LogObject.cc
----------------------------------------------------------------------
diff --git a/proxy/logging/LogObject.cc b/proxy/logging/LogObject.cc
index 77fe808..7311773 100644
--- a/proxy/logging/LogObject.cc
+++ b/proxy/logging/LogObject.cc
@@ -26,7 +26,7 @@
***************************************************************************/
-#include "ts/libts.h"
+#include "ts/ink_platform.h"
#include "Error.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/3fe162d5/proxy/logging/LogObject.h
----------------------------------------------------------------------
diff --git a/proxy/logging/LogObject.h b/proxy/logging/LogObject.h
index 3d6fe4d..bfbb8a6 100644
--- a/proxy/logging/LogObject.h
+++ b/proxy/logging/LogObject.h
@@ -25,7 +25,7 @@
#ifndef LOG_OBJECT_H
#define LOG_OBJECT_H
-#include "ts/libts.h"
+#include "ts/ink_platform.h"
#include "Log.h"
#include "LogFile.h"
#include "LogFormat.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/3fe162d5/proxy/logging/LogSock.h
----------------------------------------------------------------------
diff --git a/proxy/logging/LogSock.h b/proxy/logging/LogSock.h
index 1bf5118..489dd48 100644
--- a/proxy/logging/LogSock.h
+++ b/proxy/logging/LogSock.h
@@ -25,7 +25,7 @@
#ifndef LOG_SOCK_H
#define LOG_SOCK_H
-#include "ts/libts.h"
+#include "ts/ink_platform.h"
/*-------------------------------------------------------------------------
LogSock
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/3fe162d5/proxy/logging/LogStandalone.cc
----------------------------------------------------------------------
diff --git a/proxy/logging/LogStandalone.cc b/proxy/logging/LogStandalone.cc
index 4b74479..de289a3 100644
--- a/proxy/logging/LogStandalone.cc
+++ b/proxy/logging/LogStandalone.cc
@@ -27,7 +27,7 @@
***************************************************************************/
-#include "ts/libts.h"
+#include "ts/ink_platform.h"
#include "ts/ink_sys_control.h"
#include "ts/signals.h"
#include "DiagsConfig.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/3fe162d5/proxy/logging/LogUtils.h
----------------------------------------------------------------------
diff --git a/proxy/logging/LogUtils.h b/proxy/logging/LogUtils.h
index 3d815b5a..4a0737d 100644
--- a/proxy/logging/LogUtils.h
+++ b/proxy/logging/LogUtils.h
@@ -25,7 +25,7 @@
#include "time.h"
-#include "ts/libts.h"
+#include "ts/ink_platform.h"
#include "ts/Arena.h"
namespace LogUtils
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/3fe162d5/proxy/logstats.cc
----------------------------------------------------------------------
diff --git a/proxy/logstats.cc b/proxy/logstats.cc
index 9e73bc3..7143835 100644
--- a/proxy/logstats.cc
+++ b/proxy/logstats.cc
@@ -21,8 +21,7 @@
limitations under the License.
*/
-#include "ts/libts.h"
-#undef std // FIXME: remove dependency on the STL
+#include "ts/ink_platform.h"
#include "ts/ink_config.h"
#include "ts/ink_file.h"
#include "ts/I_Layout.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/3fe162d5/proxy/sac.cc
----------------------------------------------------------------------
diff --git a/proxy/sac.cc b/proxy/sac.cc
index 6d6bd0d..3c20573 100644
--- a/proxy/sac.cc
+++ b/proxy/sac.cc
@@ -21,7 +21,7 @@
limitations under the License.
*/
-#include "ts/libts.h"
+#include "ts/ink_platform.h"
#include "ts/I_Layout.h"
#include "P_Net.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/3fe162d5/proxy/shared/DiagsConfig.cc
----------------------------------------------------------------------
diff --git a/proxy/shared/DiagsConfig.cc b/proxy/shared/DiagsConfig.cc
index c4da2a8..8a5f3f2 100644
--- a/proxy/shared/DiagsConfig.cc
+++ b/proxy/shared/DiagsConfig.cc
@@ -21,7 +21,9 @@
limitations under the License.
*/
-#include "ts/libts.h"
+#include "ts/ink_platform.h"
+#include "ts/ink_memory.h"
+#include "ts/ink_file.h"
#include "ts/I_Layout.h"
#include "DiagsConfig.h"
#include "P_RecCore.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/3fe162d5/proxy/shared/Error.cc
----------------------------------------------------------------------
diff --git a/proxy/shared/Error.cc b/proxy/shared/Error.cc
index 8a72320..a7722bf 100644
--- a/proxy/shared/Error.cc
+++ b/proxy/shared/Error.cc
@@ -33,6 +33,8 @@
#include "Error.h"
#include <time.h>
#include "ts/ink_platform.h"
+#include "ts/ink_assert.h"
+#include "ts/ink_thread.h"
ErrorClass::~ErrorClass()
{
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/3fe162d5/proxy/shared/Error.h
----------------------------------------------------------------------
diff --git a/proxy/shared/Error.h b/proxy/shared/Error.h
index 8bc7faf..77ca0cd 100644
--- a/proxy/shared/Error.h
+++ b/proxy/shared/Error.h
@@ -34,7 +34,7 @@
#if !defined _Error_h_
#define _Error_h_
-#include "ts/libts.h"
+#include "ts/ink_platform.h"
#include "ts/Diags.h"
//////////////////////////////////////////////////////////////////////////////
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/3fe162d5/proxy/shared/InkXml.cc
----------------------------------------------------------------------
diff --git a/proxy/shared/InkXml.cc b/proxy/shared/InkXml.cc
index f48e135..bcfc11c 100644
--- a/proxy/shared/InkXml.cc
+++ b/proxy/shared/InkXml.cc
@@ -26,7 +26,9 @@
***************************************************************************/
-#include "ts/libts.h"
+#include "ts/ink_platform.h"
+#include "ts/Diags.h"
+#include "ts/ParseRules.h"
#include "InkXml.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/3fe162d5/proxy/shared/UglyLogStubs.cc
----------------------------------------------------------------------
diff --git a/proxy/shared/UglyLogStubs.cc b/proxy/shared/UglyLogStubs.cc
index ecb48bc..c707286 100644
--- a/proxy/shared/UglyLogStubs.cc
+++ b/proxy/shared/UglyLogStubs.cc
@@ -25,7 +25,7 @@
// This is total BS, because our libraries are riddled with cross dependencies.
// TODO: Clean up the dependency mess, and get rid of this.
-#include "ts/libts.h"
+#include "ts/ink_platform.h"
#include "LogObject.h"
#if defined(solaris)
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/3fe162d5/proxy/spdy/SpdyCommon.h
----------------------------------------------------------------------
diff --git a/proxy/spdy/SpdyCommon.h b/proxy/spdy/SpdyCommon.h
index 1049139..c7214b6 100644
--- a/proxy/spdy/SpdyCommon.h
+++ b/proxy/spdy/SpdyCommon.h
@@ -36,7 +36,7 @@
#include "P_Net.h"
#include "ts/ts.h"
-#include "ts/libts.h"
+#include "ts/ink_platform.h"
#include "ts/experimental.h"
#include <spdylay/spdylay.h>
using namespace std;
[4/7] trafficserver git commit: TS-3759 Eliminate -Ilib/ts
Posted by zw...@apache.org.
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/mgmt/utils/MgmtMarshall.cc
----------------------------------------------------------------------
diff --git a/mgmt/utils/MgmtMarshall.cc b/mgmt/utils/MgmtMarshall.cc
index c07f192..701ef65 100644
--- a/mgmt/utils/MgmtMarshall.cc
+++ b/mgmt/utils/MgmtMarshall.cc
@@ -21,7 +21,7 @@
limitations under the License.
*/
-#include "libts.h"
+#include "ts/libts.h"
#include "MgmtMarshall.h"
#include "MgmtSocket.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/mgmt/utils/MgmtSocket.cc
----------------------------------------------------------------------
diff --git a/mgmt/utils/MgmtSocket.cc b/mgmt/utils/MgmtSocket.cc
index 37f158e..bab4e90 100644
--- a/mgmt/utils/MgmtSocket.cc
+++ b/mgmt/utils/MgmtSocket.cc
@@ -21,7 +21,7 @@
limitations under the License.
*/
-#include "ink_platform.h"
+#include "ts/ink_platform.h"
#include "MgmtSocket.h"
#if HAVE_UCRED_H
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/mgmt/utils/MgmtSocket.h
----------------------------------------------------------------------
diff --git a/mgmt/utils/MgmtSocket.h b/mgmt/utils/MgmtSocket.h
index a16eca4..a48228a 100644
--- a/mgmt/utils/MgmtSocket.h
+++ b/mgmt/utils/MgmtSocket.h
@@ -24,7 +24,7 @@
#ifndef _MGMT_SOCKET_H_
#define _MGMT_SOCKET_H_
-#include "ink_platform.h"
+#include "ts/ink_platform.h"
//-------------------------------------------------------------------------
// defines
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/mgmt/utils/MgmtUtils.cc
----------------------------------------------------------------------
diff --git a/mgmt/utils/MgmtUtils.cc b/mgmt/utils/MgmtUtils.cc
index 0d9bb26..b447e67 100644
--- a/mgmt/utils/MgmtUtils.cc
+++ b/mgmt/utils/MgmtUtils.cc
@@ -20,9 +20,9 @@
See the License for the specific language governing permissions and
limitations under the License.
*/
-#include "libts.h"
+#include "ts/libts.h"
#include "MgmtUtils.h"
-#include "Diags.h"
+#include "ts/Diags.h"
#include "LocalManager.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/mgmt/utils/MgmtUtils.h
----------------------------------------------------------------------
diff --git a/mgmt/utils/MgmtUtils.h b/mgmt/utils/MgmtUtils.h
index a270184..b4271a8 100644
--- a/mgmt/utils/MgmtUtils.h
+++ b/mgmt/utils/MgmtUtils.h
@@ -34,8 +34,8 @@
#ifndef _MGMT_UTILS_H
#define _MGMT_UTILS_H
-#include "ink_platform.h"
-#include "Diags.h"
+#include "ts/ink_platform.h"
+#include "ts/Diags.h"
#include "P_RecCore.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/mgmt/utils/test_marshall.cc
----------------------------------------------------------------------
diff --git a/mgmt/utils/test_marshall.cc b/mgmt/utils/test_marshall.cc
index 6cc1847..3b4b8da 100644
--- a/mgmt/utils/test_marshall.cc
+++ b/mgmt/utils/test_marshall.cc
@@ -16,9 +16,9 @@
* limitations under the License.
*/
-#include "ink_defs.h"
-#include "ink_thread.h"
-#include "ink_inet.h"
+#include "ts/ink_defs.h"
+#include "ts/ink_thread.h"
+#include "ts/ink_inet.h"
#include <ts/TestBox.h>
#include <MgmtMarshall.h>
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/plugins/experimental/ats_pagespeed/gzip/gzip.cc
----------------------------------------------------------------------
diff --git a/plugins/experimental/ats_pagespeed/gzip/gzip.cc b/plugins/experimental/ats_pagespeed/gzip/gzip.cc
index 5b3507e..64b8726 100644
--- a/plugins/experimental/ats_pagespeed/gzip/gzip.cc
+++ b/plugins/experimental/ats_pagespeed/gzip/gzip.cc
@@ -29,7 +29,7 @@
#include "debug_macros.h"
#include "misc.h"
#include "configuration.h"
-//#include "ink_defs.h"
+//#include "ts/ink_defs.h"
using namespace std;
using namespace Gzip;
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/plugins/experimental/ats_pagespeed/gzip/misc.cc
----------------------------------------------------------------------
diff --git a/plugins/experimental/ats_pagespeed/gzip/misc.cc b/plugins/experimental/ats_pagespeed/gzip/misc.cc
index 2784dff..0ab94c5 100644
--- a/plugins/experimental/ats_pagespeed/gzip/misc.cc
+++ b/plugins/experimental/ats_pagespeed/gzip/misc.cc
@@ -22,7 +22,7 @@
*/
#include "ts/ts.h"
-//#include "ink_defs.h"
+//#include "ts/ink_defs.h"
#include <stdint.h>
#include <inttypes.h>
#include "misc.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/plugins/experimental/channel_stats/channel_stats.cc
----------------------------------------------------------------------
diff --git a/plugins/experimental/channel_stats/channel_stats.cc b/plugins/experimental/channel_stats/channel_stats.cc
index 459f1a5..b971d72 100644
--- a/plugins/experimental/channel_stats/channel_stats.cc
+++ b/plugins/experimental/channel_stats/channel_stats.cc
@@ -16,8 +16,8 @@
limitations under the License.
*/
-#include "ink_platform.h"
-#include "ink_defs.h"
+#include "ts/ink_platform.h"
+#include "ts/ink_defs.h"
#include <cstdio>
#include <cstring>
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/plugins/experimental/channel_stats/debug_macros.h
----------------------------------------------------------------------
diff --git a/plugins/experimental/channel_stats/debug_macros.h b/plugins/experimental/channel_stats/debug_macros.h
index c59e34e..c20b758 100644
--- a/plugins/experimental/channel_stats/debug_macros.h
+++ b/plugins/experimental/channel_stats/debug_macros.h
@@ -19,7 +19,7 @@
#ifndef _DBG_MACROS_H
#define _DBG_MACROS_H
-#include "ink_defs.h"
+#include "ts/ink_defs.h"
#define TAG PLUGIN_NAME
#define API_TAG PLUGIN_NAME ".api"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/AbstractBuffer.cc
----------------------------------------------------------------------
diff --git a/proxy/AbstractBuffer.cc b/proxy/AbstractBuffer.cc
index d386f6d..bd8bab9 100644
--- a/proxy/AbstractBuffer.cc
+++ b/proxy/AbstractBuffer.cc
@@ -21,12 +21,12 @@
limitations under the License.
*/
-#include "ink_config.h"
+#include "ts/ink_config.h"
#include <assert.h>
#include <string.h>
#include "AbstractBuffer.h"
/* #include "CacheAtomic.h" */
-#include "ink_align.h"
+#include "ts/ink_align.h"
/*-------------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/AbstractBuffer.h
----------------------------------------------------------------------
diff --git a/proxy/AbstractBuffer.h b/proxy/AbstractBuffer.h
index a6e7d14..d86f763 100644
--- a/proxy/AbstractBuffer.h
+++ b/proxy/AbstractBuffer.h
@@ -25,7 +25,7 @@
#define __ABSTRACT_BUFFER_H__
-#include "libts.h"
+#include "ts/libts.h"
enum ABError {
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/CacheControl.cc
----------------------------------------------------------------------
diff --git a/proxy/CacheControl.cc b/proxy/CacheControl.cc
index 77af5fe..c1129ca 100644
--- a/proxy/CacheControl.cc
+++ b/proxy/CacheControl.cc
@@ -30,7 +30,7 @@
#include <sys/types.h>
-#include "ink_config.h"
+#include "ts/ink_config.h"
#include "CacheControl.h"
#include "ControlMatcher.h"
#include "Main.h"
@@ -41,7 +41,7 @@
#include "HttpConfig.h"
#include "StatSystem.h"
#include "P_Cache.h"
-#include "Regex.h"
+#include "ts/Regex.h"
static const char modulePrefix[] = "[CacheControl]";
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/ControlBase.cc
----------------------------------------------------------------------
diff --git a/proxy/ControlBase.cc b/proxy/ControlBase.cc
index a149124..a1a7c88 100644
--- a/proxy/ControlBase.cc
+++ b/proxy/ControlBase.cc
@@ -28,19 +28,19 @@
*
*
****************************************************************************/
-#include "ink_platform.h"
-#include "ink_defs.h"
-#include "ink_time.h"
+#include "ts/ink_platform.h"
+#include "ts/ink_defs.h"
+#include "ts/ink_time.h"
#include "Main.h"
#include "URL.h"
-#include "Tokenizer.h"
+#include "ts/Tokenizer.h"
#include "ControlBase.h"
-#include "MatcherUtils.h"
+#include "ts/MatcherUtils.h"
#include "HTTP.h"
#include "ControlMatcher.h"
#include "HdrUtils.h"
-#include "Vec.h"
+#include "ts/Vec.h"
#include <ts/TsBuffer.h>
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/ControlBase.h
----------------------------------------------------------------------
diff --git a/proxy/ControlBase.h b/proxy/ControlBase.h
index 48d393d..5c69a69 100644
--- a/proxy/ControlBase.h
+++ b/proxy/ControlBase.h
@@ -33,7 +33,7 @@
#ifndef _CONTROL_BASE_H_
#define _CONTROL_BASE_H_
-#include "libts.h"
+#include "ts/libts.h"
class HttpRequestData;
class Tokenizer;
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/ControlMatcher.cc
----------------------------------------------------------------------
diff --git a/proxy/ControlMatcher.cc b/proxy/ControlMatcher.cc
index b2e0748..fa4c71d 100644
--- a/proxy/ControlMatcher.cc
+++ b/proxy/ControlMatcher.cc
@@ -28,14 +28,14 @@
*
****************************************************************************/
-#include "ink_config.h"
+#include "ts/ink_config.h"
#include <sys/types.h>
#include "Main.h"
#include "ProxyConfig.h"
#include "ControlMatcher.h"
#include "CacheControl.h"
#include "ParentSelection.h"
-#include "HostLookup.h"
+#include "ts/HostLookup.h"
#include "HTTP.h"
#include "URL.h"
#include "P_EventSystem.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/ControlMatcher.h
----------------------------------------------------------------------
diff --git a/proxy/ControlMatcher.h b/proxy/ControlMatcher.h
index 999d09f..7a75b8f 100644
--- a/proxy/ControlMatcher.h
+++ b/proxy/ControlMatcher.h
@@ -87,13 +87,13 @@
#ifndef _CONTROL_MATCHER_H_
#define _CONTROL_MATCHER_H_
-#include "DynArray.h"
+#include "ts/DynArray.h"
#include <ts/IpMap.h>
-#include "ink_apidefs.h"
-#include "ink_defs.h"
+#include "ts/ink_apidefs.h"
+#include "ts/ink_defs.h"
#include "HTTP.h"
-#include "Regex.h"
+#include "ts/Regex.h"
#ifdef HAVE_CTYPE_H
#include <ctype.h>
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/CoreUtils.cc
----------------------------------------------------------------------
diff --git a/proxy/CoreUtils.cc b/proxy/CoreUtils.cc
index 32c3bff..f4cce46 100644
--- a/proxy/CoreUtils.cc
+++ b/proxy/CoreUtils.cc
@@ -87,7 +87,7 @@
/* modify the "note" in process_core */
/* Document properly */
-#include "ink_config.h"
+#include "ts/ink_config.h"
#if defined(linux)
#include "CoreUtils.h"
@@ -105,7 +105,7 @@ int program_counter = 0;
#include <stdlib.h>
#include <stdint.h>
#include <math.h>
-#include "libts.h"
+#include "ts/libts.h"
#include "CoreUtils.h"
#endif /* darwin || freebsd || solaris */
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/CoreUtils.h
----------------------------------------------------------------------
diff --git a/proxy/CoreUtils.h b/proxy/CoreUtils.h
index 39af0a3..ba7b03a 100644
--- a/proxy/CoreUtils.h
+++ b/proxy/CoreUtils.h
@@ -40,7 +40,7 @@
#include <math.h>
#include <assert.h>
#include <elf.h>
-#include "DynArray.h"
+#include "ts/DynArray.h"
#define SP_REGNUM 15 /* Contains address of top of stack USP */
#define PC_REGNUM 12 /* Contains program counter EIP */
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/Crash.cc
----------------------------------------------------------------------
diff --git a/proxy/Crash.cc b/proxy/Crash.cc
index 0febbea..815efe1 100644
--- a/proxy/Crash.cc
+++ b/proxy/Crash.cc
@@ -22,10 +22,10 @@
*/
#include "Main.h"
-#include "I_Layout.h"
+#include "ts/I_Layout.h"
#include "I_Net.h"
-#include "signals.h"
-#include "ink_cap.h"
+#include "ts/signals.h"
+#include "ts/ink_cap.h"
// ucontext.h is deprecated on Darwin, and we really only need it on Linux, so only
// include it if we are planning to use it.
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/EventName.cc
----------------------------------------------------------------------
diff --git a/proxy/EventName.cc b/proxy/EventName.cc
index 5820236..f55272e 100644
--- a/proxy/EventName.cc
+++ b/proxy/EventName.cc
@@ -22,7 +22,7 @@
*/
-#include "ink_config.h"
+#include "ts/ink_config.h"
#include <stdio.h>
#include <string.h>
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/FetchSM.cc
----------------------------------------------------------------------
diff --git a/proxy/FetchSM.cc b/proxy/FetchSM.cc
index 8c03597..045e26a 100644
--- a/proxy/FetchSM.cc
+++ b/proxy/FetchSM.cc
@@ -21,7 +21,7 @@
limitations under the License.
*/
-#include "ink_config.h"
+#include "ts/ink_config.h"
#include "FetchSM.h"
#include <stdio.h>
#include "HTTP.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/ICP.cc
----------------------------------------------------------------------
diff --git a/proxy/ICP.cc b/proxy/ICP.cc
index 4acb633..57a2fb2 100644
--- a/proxy/ICP.cc
+++ b/proxy/ICP.cc
@@ -28,7 +28,7 @@
****************************************************************************/
-#include "libts.h"
+#include "ts/libts.h"
#include "Main.h"
#include "P_EventSystem.h"
#include "P_Cache.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/ICP.h
----------------------------------------------------------------------
diff --git a/proxy/ICP.h b/proxy/ICP.h
index 40865e2..08e4700 100644
--- a/proxy/ICP.h
+++ b/proxy/ICP.h
@@ -38,7 +38,7 @@
#include "URL.h"
#include "ICPevents.h"
#include "ICPProcessor.h"
-#include "DynArray.h"
+#include "ts/DynArray.h"
//*********************************************************************
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/ICPConfig.cc
----------------------------------------------------------------------
diff --git a/proxy/ICPConfig.cc b/proxy/ICPConfig.cc
index 942e12a..f7eb257 100644
--- a/proxy/ICPConfig.cc
+++ b/proxy/ICPConfig.cc
@@ -28,7 +28,7 @@
****************************************************************************/
-#include "libts.h"
+#include "ts/libts.h"
#include "P_EventSystem.h"
#include "P_Cache.h"
#include "P_Net.h"
@@ -38,7 +38,7 @@
#include "ICPProcessor.h"
#include "ICPlog.h"
#include "BaseManager.h"
-#include "I_Layout.h"
+#include "ts/I_Layout.h"
//--------------------------------------------------------------------------
// Each ICP peer is described in "icp.config" with the
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/IPAllow.cc
----------------------------------------------------------------------
diff --git a/proxy/IPAllow.cc b/proxy/IPAllow.cc
index 8a88866..6f414cf 100644
--- a/proxy/IPAllow.cc
+++ b/proxy/IPAllow.cc
@@ -28,7 +28,7 @@
*
****************************************************************************/
-#include "libts.h"
+#include "ts/libts.h"
#include "Main.h"
#include "IPAllow.h"
#include "ProxyConfig.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/InkAPI.cc
----------------------------------------------------------------------
diff --git a/proxy/InkAPI.cc b/proxy/InkAPI.cc
index 8fa4fc4..069fcb6 100644
--- a/proxy/InkAPI.cc
+++ b/proxy/InkAPI.cc
@@ -23,8 +23,8 @@
#include <stdio.h>
-#include "libts.h"
-#include "I_Layout.h"
+#include "ts/libts.h"
+#include "ts/I_Layout.h"
#include "ts.h"
#include "InkAPIInternal.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/InkAPIInternal.h
----------------------------------------------------------------------
diff --git a/proxy/InkAPIInternal.h b/proxy/InkAPIInternal.h
index ede71f1..241e177 100644
--- a/proxy/InkAPIInternal.h
+++ b/proxy/InkAPIInternal.h
@@ -32,7 +32,7 @@
#include "experimental.h"
#include "InkAPIPrivateIOCore.h"
#include "HTTP.h"
-#include "List.h"
+#include "ts/List.h"
#include "ProxyConfig.h"
#include "P_Cache.h"
#include "I_Tasks.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/InkAPITest.cc
----------------------------------------------------------------------
diff --git a/proxy/InkAPITest.cc b/proxy/InkAPITest.cc
index 83161af..fcf2997 100644
--- a/proxy/InkAPITest.cc
+++ b/proxy/InkAPITest.cc
@@ -27,7 +27,7 @@
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
#endif
-#include "ink_config.h"
+#include "ts/ink_config.h"
#include <sys/types.h>
#include <errno.h>
@@ -38,7 +38,7 @@
#include <stdio.h>
#include <string.h>
-#include "Regression.h"
+#include "ts/Regression.h"
#include "api/ts/ts.h"
#include "api/ts/experimental.h"
#include "I_RecCore.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/InkAPITestTool.cc
----------------------------------------------------------------------
diff --git a/proxy/InkAPITestTool.cc b/proxy/InkAPITestTool.cc
index b5e6707..75b2efc 100644
--- a/proxy/InkAPITestTool.cc
+++ b/proxy/InkAPITestTool.cc
@@ -21,7 +21,7 @@
limitations under the License.
*/
-#include "Regression.h"
+#include "ts/Regression.h"
#include "api/ts/ts.h"
#include <arpa/inet.h> /* For htonl */
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/InkIOCoreAPI.cc
----------------------------------------------------------------------
diff --git a/proxy/InkIOCoreAPI.cc b/proxy/InkIOCoreAPI.cc
index ecc05b0..a2e86e0 100644
--- a/proxy/InkIOCoreAPI.cc
+++ b/proxy/InkIOCoreAPI.cc
@@ -27,7 +27,7 @@
* file to ensure that it gets exported as a global symbol in TS
*/
-#include "libts.h"
+#include "ts/libts.h"
#include "api/ts/InkAPIPrivateIOCore.h"
#if defined(solaris) && !defined(__GNUC__)
#include "P_EventSystem.h" // I_EventSystem.h
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/InkPool_r.h
----------------------------------------------------------------------
diff --git a/proxy/InkPool_r.h b/proxy/InkPool_r.h
index 2b7a8b5..262355c 100644
--- a/proxy/InkPool_r.h
+++ b/proxy/InkPool_r.h
@@ -24,7 +24,7 @@
#ifndef __INK_POOL_R_H_INCLUDED__
#define __INK_POOL_R_H_INCLUDED__
-#include "InkPool.h"
+#include "ts/InkPool.h"
#include "P_EventSystem.h"
template <class C> class InkStaticPool_r : public InkStaticPool<C>
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/Main.cc
----------------------------------------------------------------------
diff --git a/proxy/Main.cc b/proxy/Main.cc
index c71e203..49a01f3 100644
--- a/proxy/Main.cc
+++ b/proxy/Main.cc
@@ -30,10 +30,10 @@
****************************************************************************/
-#include "ink_config.h"
+#include "ts/ink_config.h"
-#include "libts.h"
-#include "ink_sys_control.h"
+#include "ts/libts.h"
+#include "ts/ink_sys_control.h"
#include <syslog.h>
#if !defined(linux)
@@ -51,7 +51,7 @@ extern "C" int plock(int);
#endif
#include "Main.h"
-#include "signals.h"
+#include "ts/signals.h"
#include "Error.h"
#include "StatSystem.h"
#include "P_EventSystem.h"
@@ -62,7 +62,7 @@ extern "C" int plock(int);
#include "P_Cluster.h"
#include "P_HostDB.h"
#include "P_Cache.h"
-#include "I_Layout.h"
+#include "ts/I_Layout.h"
#include "I_Machine.h"
#include "RecordsConfig.h"
#include "I_RecProcess.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/Main.h
----------------------------------------------------------------------
diff --git a/proxy/Main.h b/proxy/Main.h
index b1f3c9b..278206b 100644
--- a/proxy/Main.h
+++ b/proxy/Main.h
@@ -24,9 +24,9 @@
#define _Main_h_
#include <ts/ink_defs.h>
-#include "libts.h"
-#include "Regression.h"
-#include "I_Version.h"
+#include "ts/libts.h"
+#include "ts/Regression.h"
+#include "ts/I_Version.h"
//
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/Makefile.am
----------------------------------------------------------------------
diff --git a/proxy/Makefile.am b/proxy/Makefile.am
index 4935798..6dc0f6f 100644
--- a/proxy/Makefile.am
+++ b/proxy/Makefile.am
@@ -36,8 +36,6 @@ TESTS = \
AM_CPPFLAGS = \
$(iocore_include_dirs) \
-I$(top_srcdir)/lib/records \
- -I$(top_srcdir)/lib/ts \
- -I$(top_builddir)/lib/ts \
-I$(srcdir)/http \
-I$(srcdir)/http2 \
-I$(srcdir)/spdy \
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/ParentSelection.cc
----------------------------------------------------------------------
diff --git a/proxy/ParentSelection.cc b/proxy/ParentSelection.cc
index cd30180..5d63861 100644
--- a/proxy/ParentSelection.cc
+++ b/proxy/ParentSelection.cc
@@ -20,7 +20,7 @@
See the License for the specific language governing permissions and
limitations under the License.
*/
-#include "libts.h"
+#include "ts/libts.h"
#include "P_EventSystem.h"
#include "ParentSelection.h"
#include "ControlMatcher.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/ParentSelection.h
----------------------------------------------------------------------
diff --git a/proxy/ParentSelection.h b/proxy/ParentSelection.h
index e3ac989..51d21ed 100644
--- a/proxy/ParentSelection.h
+++ b/proxy/ParentSelection.h
@@ -36,11 +36,11 @@
#include "ControlBase.h"
#include "ControlMatcher.h"
-#include "ink_apidefs.h"
+#include "ts/ink_apidefs.h"
#include "P_RecProcess.h"
-#include "libts.h"
+#include "ts/libts.h"
#define MAX_PARENTS 64
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/Plugin.cc
----------------------------------------------------------------------
diff --git a/proxy/Plugin.cc b/proxy/Plugin.cc
index 6927fa1..a621b92 100644
--- a/proxy/Plugin.cc
+++ b/proxy/Plugin.cc
@@ -22,15 +22,15 @@
*/
#include <stdio.h>
-#include "ink_platform.h"
-#include "ink_file.h"
-#include "ParseRules.h"
+#include "ts/ink_platform.h"
+#include "ts/ink_file.h"
+#include "ts/ParseRules.h"
#include "I_RecCore.h"
-#include "I_Layout.h"
+#include "ts/I_Layout.h"
#include "InkAPIInternal.h"
#include "Main.h"
#include "Plugin.h"
-#include "ink_cap.h"
+#include "ts/ink_cap.h"
static const char *plugin_dir = ".";
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/Plugin.h
----------------------------------------------------------------------
diff --git a/proxy/Plugin.h b/proxy/Plugin.h
index 9364e61..78f05f4 100644
--- a/proxy/Plugin.h
+++ b/proxy/Plugin.h
@@ -24,7 +24,7 @@
#ifndef __PLUGIN_H__
#define __PLUGIN_H__
-#include "List.h"
+#include "ts/List.h"
struct PluginRegInfo {
PluginRegInfo();
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/PluginVC.cc
----------------------------------------------------------------------
diff --git a/proxy/PluginVC.cc b/proxy/PluginVC.cc
index 723aa9d..d1072ad 100644
--- a/proxy/PluginVC.cc
+++ b/proxy/PluginVC.cc
@@ -74,7 +74,7 @@
#include "PluginVC.h"
#include "P_EventSystem.h"
#include "P_Net.h"
-#include "Regression.h"
+#include "ts/Regression.h"
#define PVC_LOCK_RETRY_TIME HRTIME_MSECONDS(10)
#define PVC_DEFAULT_MAX_BYTES 32768
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/PluginVC.h
----------------------------------------------------------------------
diff --git a/proxy/PluginVC.h b/proxy/PluginVC.h
index 3352ac9..b495a1d 100644
--- a/proxy/PluginVC.h
+++ b/proxy/PluginVC.h
@@ -38,7 +38,7 @@
#include "Plugin.h"
#include "P_Net.h"
-#include "ink_atomic.h"
+#include "ts/ink_atomic.h"
class PluginVCCore;
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/ProxyClientSession.h
----------------------------------------------------------------------
diff --git a/proxy/ProxyClientSession.h b/proxy/ProxyClientSession.h
index 4ed616c..c1ba124 100644
--- a/proxy/ProxyClientSession.h
+++ b/proxy/ProxyClientSession.h
@@ -24,7 +24,7 @@
#ifndef __PROXY_CLIENT_SESSION_H__
#define __PROXY_CLIENT_SESSION_H__
-#include "libts.h"
+#include "ts/libts.h"
#include "P_Net.h"
#include "InkAPIInternal.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/ReverseProxy.cc
----------------------------------------------------------------------
diff --git a/proxy/ReverseProxy.cc b/proxy/ReverseProxy.cc
index e16f917..68d3e8a 100644
--- a/proxy/ReverseProxy.cc
+++ b/proxy/ReverseProxy.cc
@@ -27,7 +27,7 @@
*/
-#include "libts.h"
+#include "ts/libts.h"
#include <dlfcn.h>
#include "Main.h"
#include "Error.h"
@@ -36,8 +36,8 @@
#include "P_Cache.h"
#include "ProxyConfig.h"
#include "ReverseProxy.h"
-#include "MatcherUtils.h"
-#include "Tokenizer.h"
+#include "ts/MatcherUtils.h"
+#include "ts/Tokenizer.h"
#include "api/ts/remap.h"
#include "RemapPluginInfo.h"
#include "RemapProcessor.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/ReverseProxy.h
----------------------------------------------------------------------
diff --git a/proxy/ReverseProxy.h b/proxy/ReverseProxy.h
index 680401a..c6de9f1 100644
--- a/proxy/ReverseProxy.h
+++ b/proxy/ReverseProxy.h
@@ -35,8 +35,8 @@
#include "P_RecProcess.h"
-#include "ink_hash_table.h"
-#include "ink_defs.h"
+#include "ts/ink_hash_table.h"
+#include "ts/ink_defs.h"
#include "HttpTransact.h"
#include "RemapPluginInfo.h"
#include "UrlRewrite.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/SocksProxy.cc
----------------------------------------------------------------------
diff --git a/proxy/SocksProxy.cc b/proxy/SocksProxy.cc
index 4b0cb85..94787a9 100644
--- a/proxy/SocksProxy.cc
+++ b/proxy/SocksProxy.cc
@@ -27,7 +27,7 @@
*/
-#include "libts.h"
+#include "ts/libts.h"
#include "StatSystem.h"
#include "P_Net.h"
#include "I_OneWayTunnel.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/StatPages.cc
----------------------------------------------------------------------
diff --git a/proxy/StatPages.cc b/proxy/StatPages.cc
index f6fe0fa..136c7cd 100644
--- a/proxy/StatPages.cc
+++ b/proxy/StatPages.cc
@@ -28,11 +28,11 @@
****************************************************************************/
-#include "ink_config.h"
+#include "ts/ink_config.h"
#include "ProxyConfig.h"
#include "StatPages.h"
#include "HdrUtils.h"
-#include "MatcherUtils.h"
+#include "ts/MatcherUtils.h"
#define MAX_STAT_PAGES 32
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/StatSystem.cc
----------------------------------------------------------------------
diff --git a/proxy/StatSystem.cc b/proxy/StatSystem.cc
index a784429..a743774 100644
--- a/proxy/StatSystem.cc
+++ b/proxy/StatSystem.cc
@@ -34,7 +34,7 @@
#include "ProxyConfig.h"
#include "StatPages.h"
#include "HTTP.h"
-#include "I_Layout.h"
+#include "ts/I_Layout.h"
// defines
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/StatSystem.h
----------------------------------------------------------------------
diff --git a/proxy/StatSystem.h b/proxy/StatSystem.h
index 8f1448b..61c39de 100644
--- a/proxy/StatSystem.h
+++ b/proxy/StatSystem.h
@@ -29,15 +29,15 @@
#if !defined(_StatSystem_h_)
#define _StatSystem_h_
-#include "ink_platform.h"
-#include "ink_hrtime.h"
-#include "ink_atomic.h"
+#include "ts/ink_platform.h"
+#include "ts/ink_hrtime.h"
+#include "ts/ink_atomic.h"
#ifdef USE_LOCKS_FOR_DYN_STATS
#include "Lock.h"
#endif
-#include "ink_apidefs.h"
-#include "apidefs.h"
+#include "ts/ink_apidefs.h"
+#include "ts/apidefs.h"
#define STATS_MAJOR_VERSION 6 // increment when changing the stats!
#define DEFAULT_SNAP_FILENAME "stats.snap"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/TestClock.cc
----------------------------------------------------------------------
diff --git a/proxy/TestClock.cc b/proxy/TestClock.cc
index 14f8e6a..0df6a0b 100644
--- a/proxy/TestClock.cc
+++ b/proxy/TestClock.cc
@@ -21,7 +21,7 @@
limitations under the License.
*/
-#include "ink_hrtime.h"
+#include "ts/ink_hrtime.h"
#include <sys/time.h>
void
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/TestClusterHash.cc
----------------------------------------------------------------------
diff --git a/proxy/TestClusterHash.cc b/proxy/TestClusterHash.cc
index 73ab208..93e65b9 100644
--- a/proxy/TestClusterHash.cc
+++ b/proxy/TestClusterHash.cc
@@ -26,7 +26,7 @@
TestClusterHash.cc
****************************************************************************/
#include "Cluster.h"
-#include "libts.h"
+#include "ts/libts.h"
//
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/TestDNS.cc
----------------------------------------------------------------------
diff --git a/proxy/TestDNS.cc b/proxy/TestDNS.cc
index 239daf5..f81301f 100644
--- a/proxy/TestDNS.cc
+++ b/proxy/TestDNS.cc
@@ -38,7 +38,7 @@
#include <string.h>
#include "VConnection.h"
#include "stdio.h"
-#include "libts.h"
+#include "ts/libts.h"
#define N_STATE_MACHINES 1000
#define MEASUREMENT_INTERVAL 100
class TestDnsStateMachine;
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/TestPreProc.cc
----------------------------------------------------------------------
diff --git a/proxy/TestPreProc.cc b/proxy/TestPreProc.cc
index 68fef0d..12b0f47 100644
--- a/proxy/TestPreProc.cc
+++ b/proxy/TestPreProc.cc
@@ -26,8 +26,8 @@
#include "HttpPreProc.h"
#include "HttpMessage.h"
#include "HttpPreProcMessageManager.h"
-#include "RawHashTable.h"
-#include "ink_time.h" /* ink_time_wall_seconds() */
+#include "ts/RawHashTable.h"
+#include "ts/ink_time.h" /* ink_time_wall_seconds() */
#include <string.h>
#include <iostream.h>
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/TestRegex.cc
----------------------------------------------------------------------
diff --git a/proxy/TestRegex.cc b/proxy/TestRegex.cc
index f1e0297..ce3c74c 100644
--- a/proxy/TestRegex.cc
+++ b/proxy/TestRegex.cc
@@ -22,7 +22,7 @@
*/
#include "Main.h"
-#include "Regex.h"
+#include "ts/Regex.h"
void
test()
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/Transform.cc
----------------------------------------------------------------------
diff --git a/proxy/Transform.cc b/proxy/Transform.cc
index ce9dc01..841dad1 100644
--- a/proxy/Transform.cc
+++ b/proxy/Transform.cc
@@ -61,7 +61,7 @@
#include "ProxyConfig.h"
#include "P_Net.h"
-#include "MimeTable.h"
+#include "ts/MimeTable.h"
#include "TransformInternal.h"
#include "HdrUtils.h"
#include "Log.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/congest/Congestion.cc
----------------------------------------------------------------------
diff --git a/proxy/congest/Congestion.cc b/proxy/congest/Congestion.cc
index f7e0883..0bbeeac 100644
--- a/proxy/congest/Congestion.cc
+++ b/proxy/congest/Congestion.cc
@@ -27,7 +27,7 @@
*
*
****************************************************************************/
-#include "libts.h"
+#include "ts/libts.h"
#include "I_Net.h"
#include "CongestionDB.h"
#include "Congestion.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/congest/Congestion.h
----------------------------------------------------------------------
diff --git a/proxy/congest/Congestion.h b/proxy/congest/Congestion.h
index 760eae5..de964e6 100644
--- a/proxy/congest/Congestion.h
+++ b/proxy/congest/Congestion.h
@@ -31,7 +31,7 @@
#ifndef CONGESTION_H_
#define CONGESTION_H_
-#include "libts.h"
+#include "ts/libts.h"
#include "P_EventSystem.h"
#include "ControlBase.h"
#include "ControlMatcher.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/congest/CongestionDB.cc
----------------------------------------------------------------------
diff --git a/proxy/congest/CongestionDB.cc b/proxy/congest/CongestionDB.cc
index eedd853..bb0035c 100644
--- a/proxy/congest/CongestionDB.cc
+++ b/proxy/congest/CongestionDB.cc
@@ -27,7 +27,7 @@
*
*
****************************************************************************/
-#include "libts.h"
+#include "ts/libts.h"
#include "P_EventSystem.h"
#include "P_Net.h"
#include "Main.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/congest/CongestionTest.cc
----------------------------------------------------------------------
diff --git a/proxy/congest/CongestionTest.cc b/proxy/congest/CongestionTest.cc
index cad77e4..819fb63 100644
--- a/proxy/congest/CongestionTest.cc
+++ b/proxy/congest/CongestionTest.cc
@@ -27,7 +27,7 @@
*
*
****************************************************************************/
-#include "libts.h"
+#include "ts/libts.h"
#include <math.h>
#include "Main.h"
#include "CongestionDB.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/congest/Makefile.am
----------------------------------------------------------------------
diff --git a/proxy/congest/Makefile.am b/proxy/congest/Makefile.am
index a217582..24abea5 100644
--- a/proxy/congest/Makefile.am
+++ b/proxy/congest/Makefile.am
@@ -20,8 +20,6 @@ AM_CPPFLAGS = \
$(iocore_include_dirs) \
-I$(top_srcdir)/lib \
-I$(top_srcdir)/lib/records \
- -I$(top_srcdir)/lib/ts \
- -I$(top_builddir)/lib/ts \
-I$(top_srcdir)/proxy \
-I$(top_srcdir)/proxy/http \
-I$(top_srcdir)/mgmt \
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/hdrs/HTTP.cc
----------------------------------------------------------------------
diff --git a/proxy/hdrs/HTTP.cc b/proxy/hdrs/HTTP.cc
index 25f14d1..78e7161 100644
--- a/proxy/hdrs/HTTP.cc
+++ b/proxy/hdrs/HTTP.cc
@@ -21,14 +21,14 @@
limitations under the License.
*/
-#include "ink_defs.h"
-#include "libts.h"
+#include "ts/ink_defs.h"
+#include "ts/libts.h"
#include <assert.h>
#include <stdio.h>
#include <string.h>
#include "HTTP.h"
#include "HdrToken.h"
-#include "Diags.h"
+#include "ts/Diags.h"
/***********************************************************************
* *
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/hdrs/HTTP.h
----------------------------------------------------------------------
diff --git a/proxy/hdrs/HTTP.h b/proxy/hdrs/HTTP.h
index 4c80bcc..7d91687 100644
--- a/proxy/hdrs/HTTP.h
+++ b/proxy/hdrs/HTTP.h
@@ -25,12 +25,12 @@
#define __HTTP_H__
#include <assert.h>
-#include "Arena.h"
-#include "INK_MD5.h"
+#include "ts/Arena.h"
+#include "ts/INK_MD5.h"
#include "MIME.h"
#include "URL.h"
-#include "ink_apidefs.h"
+#include "ts/ink_apidefs.h"
#define HTTP_VERSION(a, b) ((((a)&0xFFFF) << 16) | ((b)&0xFFFF))
#define HTTP_MINOR(v) ((v)&0xFFFF)
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/hdrs/HdrHeap.cc
----------------------------------------------------------------------
diff --git a/proxy/hdrs/HdrHeap.cc b/proxy/hdrs/HdrHeap.cc
index ba35a68..ba381b7 100644
--- a/proxy/hdrs/HdrHeap.cc
+++ b/proxy/hdrs/HdrHeap.cc
@@ -30,7 +30,7 @@
****************************************************************************/
-#include "libts.h"
+#include "ts/libts.h"
#include "HdrHeap.h"
#include "URL.h"
#include "MIME.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/hdrs/HdrHeap.h
----------------------------------------------------------------------
diff --git a/proxy/hdrs/HdrHeap.h b/proxy/hdrs/HdrHeap.h
index 856e860..a06baf7 100644
--- a/proxy/hdrs/HdrHeap.h
+++ b/proxy/hdrs/HdrHeap.h
@@ -33,10 +33,10 @@
#ifndef _HDR_HEAP_H_
#define _HDR_HEAP_H_
-#include "Ptr.h"
-#include "ink_defs.h"
-#include "ink_assert.h"
-#include "Arena.h"
+#include "ts/Ptr.h"
+#include "ts/ink_defs.h"
+#include "ts/ink_assert.h"
+#include "ts/Arena.h"
#include "HdrToken.h"
// Objects in the heap must currently be aligned to 8 byte boundaries,
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/hdrs/HdrTSOnly.cc
----------------------------------------------------------------------
diff --git a/proxy/hdrs/HdrTSOnly.cc b/proxy/hdrs/HdrTSOnly.cc
index 03de04a..686ee13 100644
--- a/proxy/hdrs/HdrTSOnly.cc
+++ b/proxy/hdrs/HdrTSOnly.cc
@@ -37,7 +37,7 @@
****************************************************************************/
-#include "libts.h"
+#include "ts/libts.h"
#include "HTTP.h"
#include "P_EventSystem.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/hdrs/HdrTest.cc
----------------------------------------------------------------------
diff --git a/proxy/hdrs/HdrTest.cc b/proxy/hdrs/HdrTest.cc
index dc40512..ec1d672 100644
--- a/proxy/hdrs/HdrTest.cc
+++ b/proxy/hdrs/HdrTest.cc
@@ -32,12 +32,12 @@
****************************************************************************/
-#include "libts.h"
+#include "ts/libts.h"
-#include "Arena.h"
+#include "ts/Arena.h"
#include "HTTP.h"
#include "MIME.h"
-#include "Regex.h"
+#include "ts/Regex.h"
#include "URL.h"
#include "HttpCompat.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/hdrs/HdrTest.h
----------------------------------------------------------------------
diff --git a/proxy/hdrs/HdrTest.h b/proxy/hdrs/HdrTest.h
index 5018b25..445ecd5 100644
--- a/proxy/hdrs/HdrTest.h
+++ b/proxy/hdrs/HdrTest.h
@@ -35,7 +35,7 @@
#ifndef _HdrTest_H_
#define _HdrTest_H_
-#include "Regression.h"
+#include "ts/Regression.h"
class HdrTest
{
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/hdrs/HdrToken.cc
----------------------------------------------------------------------
diff --git a/proxy/hdrs/HdrToken.cc b/proxy/hdrs/HdrToken.cc
index 6f097aa..8d292ed 100644
--- a/proxy/hdrs/HdrToken.cc
+++ b/proxy/hdrs/HdrToken.cc
@@ -21,13 +21,13 @@
limitations under the License.
*/
-#include "libts.h"
+#include "ts/libts.h"
#include <stdio.h>
-#include "Allocator.h"
+#include "ts/Allocator.h"
#include "HTTP.h"
#include "HdrToken.h"
#include "MIME.h"
-#include "Regex.h"
+#include "ts/Regex.h"
#include "URL.h"
/*
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/hdrs/HdrToken.h
----------------------------------------------------------------------
diff --git a/proxy/hdrs/HdrToken.h b/proxy/hdrs/HdrToken.h
index 7d5df61..5e20670 100644
--- a/proxy/hdrs/HdrToken.h
+++ b/proxy/hdrs/HdrToken.h
@@ -26,13 +26,13 @@
#include <assert.h>
#include <sys/types.h>
-#include "ink_assert.h"
-#include "ink_atomic.h"
-#include "ink_defs.h"
-#include "ink_string.h"
-#include "Allocator.h"
-#include "Regex.h"
-#include "ink_apidefs.h"
+#include "ts/ink_assert.h"
+#include "ts/ink_atomic.h"
+#include "ts/ink_defs.h"
+#include "ts/ink_string.h"
+#include "ts/Allocator.h"
+#include "ts/Regex.h"
+#include "ts/ink_apidefs.h"
////////////////////////////////////////////////////////////////////////////
//
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/hdrs/HdrUtils.cc
----------------------------------------------------------------------
diff --git a/proxy/hdrs/HdrUtils.cc b/proxy/hdrs/HdrUtils.cc
index 6766619..9266498 100644
--- a/proxy/hdrs/HdrUtils.cc
+++ b/proxy/hdrs/HdrUtils.cc
@@ -31,7 +31,7 @@
****************************************************************************/
-#include "libts.h"
+#include "ts/libts.h"
#include "HdrUtils.h"
#define GETNEXT() \
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/hdrs/HdrUtils.h
----------------------------------------------------------------------
diff --git a/proxy/hdrs/HdrUtils.h b/proxy/hdrs/HdrUtils.h
index db43eed..efbbd90 100644
--- a/proxy/hdrs/HdrUtils.h
+++ b/proxy/hdrs/HdrUtils.h
@@ -34,7 +34,7 @@
#ifndef _HDR_UTILS_H_
#define _HDR_UTILS_H_
-#include "ParseRules.h"
+#include "ts/ParseRules.h"
#include "MIME.h"
// csv = comma separated value
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/hdrs/HttpCompat.cc
----------------------------------------------------------------------
diff --git a/proxy/hdrs/HttpCompat.cc b/proxy/hdrs/HttpCompat.cc
index e8bad1d..4ccfd65 100644
--- a/proxy/hdrs/HttpCompat.cc
+++ b/proxy/hdrs/HttpCompat.cc
@@ -21,7 +21,7 @@
limitations under the License.
*/
-#include "libts.h"
+#include "ts/libts.h"
#include "HttpCompat.h"
#include "HdrUtils.h" /* MAGIC_EDITING_TAG */
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/hdrs/HttpCompat.h
----------------------------------------------------------------------
diff --git a/proxy/hdrs/HttpCompat.h b/proxy/hdrs/HttpCompat.h
index 1cbf80b..2ef1107 100644
--- a/proxy/hdrs/HttpCompat.h
+++ b/proxy/hdrs/HttpCompat.h
@@ -24,10 +24,10 @@
#ifndef __HTTP_COMPAT_H__
#define __HTTP_COMPAT_H__
-#include "ink_string++.h"
+#include "ts/ink_string++.h"
#include "MIME.h"
-#include "RawHashTable.h"
-#include "Diags.h"
+#include "ts/RawHashTable.h"
+#include "ts/Diags.h"
struct HttpBodySetRawData {
unsigned int magic;
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/hdrs/MIME.cc
----------------------------------------------------------------------
diff --git a/proxy/hdrs/MIME.cc b/proxy/hdrs/MIME.cc
index b4378e6..af989f3 100644
--- a/proxy/hdrs/MIME.cc
+++ b/proxy/hdrs/MIME.cc
@@ -21,8 +21,8 @@
limitations under the License.
*/
-#include "ink_defs.h"
-#include "libts.h"
+#include "ts/ink_defs.h"
+#include "ts/libts.h"
#include <assert.h>
#include <stdio.h>
#include <string.h>
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/hdrs/MIME.h
----------------------------------------------------------------------
diff --git a/proxy/hdrs/MIME.h b/proxy/hdrs/MIME.h
index f55da24..5589383 100644
--- a/proxy/hdrs/MIME.h
+++ b/proxy/hdrs/MIME.h
@@ -26,9 +26,9 @@
#include <sys/time.h>
-#include "ink_assert.h"
-#include "ink_apidefs.h"
-#include "ink_string++.h"
+#include "ts/ink_assert.h"
+#include "ts/ink_apidefs.h"
+#include "ts/ink_string++.h"
#include "HdrHeap.h"
#include "HdrToken.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/hdrs/Makefile.am
----------------------------------------------------------------------
diff --git a/proxy/hdrs/Makefile.am b/proxy/hdrs/Makefile.am
index 6d475d3..f0a6515 100644
--- a/proxy/hdrs/Makefile.am
+++ b/proxy/hdrs/Makefile.am
@@ -19,9 +19,7 @@
AM_CPPFLAGS = \
$(iocore_include_dirs) \
-I$(top_srcdir)/lib \
- -I$(top_srcdir)/lib/records \
- -I$(top_srcdir)/lib/ts \
- -I$(top_builddir)/lib/ts
+ -I$(top_srcdir)/lib/records
noinst_LIBRARIES = libhdrs.a
EXTRA_PROGRAMS = load_http_hdr
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/hdrs/URL.cc
----------------------------------------------------------------------
diff --git a/proxy/hdrs/URL.cc b/proxy/hdrs/URL.cc
index e6cde0b..430e83a 100644
--- a/proxy/hdrs/URL.cc
+++ b/proxy/hdrs/URL.cc
@@ -23,11 +23,11 @@
#include <assert.h>
#include <new>
-#include "libts.h"
+#include "ts/libts.h"
#include "URL.h"
#include "MIME.h"
#include "HTTP.h"
-#include "Diags.h"
+#include "ts/Diags.h"
const char *URL_SCHEME_FILE;
const char *URL_SCHEME_FTP;
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/hdrs/URL.h
----------------------------------------------------------------------
diff --git a/proxy/hdrs/URL.h b/proxy/hdrs/URL.h
index de82af1..d56b170 100644
--- a/proxy/hdrs/URL.h
+++ b/proxy/hdrs/URL.h
@@ -24,14 +24,14 @@
#ifndef __URL_H__
#define __URL_H__
-#include "Arena.h"
+#include "ts/Arena.h"
#include "HdrToken.h"
#include "HdrHeap.h"
-#include "INK_MD5.h"
-#include "MMH.h"
+#include "ts/INK_MD5.h"
+#include "ts/MMH.h"
#include "MIME.h"
-#include "ink_apidefs.h"
+#include "ts/ink_apidefs.h"
typedef int64_t cache_generation_t;
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/hdrs/load_http_hdr.cc
----------------------------------------------------------------------
diff --git a/proxy/hdrs/load_http_hdr.cc b/proxy/hdrs/load_http_hdr.cc
index c04fe5f..3bf7dac 100644
--- a/proxy/hdrs/load_http_hdr.cc
+++ b/proxy/hdrs/load_http_hdr.cc
@@ -46,8 +46,8 @@
#include "HdrHeap.h"
#include "MIME.h"
#include "HTTP.h"
-#include "Tokenizer.h"
-#include "Diags.h"
+#include "ts/Tokenizer.h"
+#include "ts/Diags.h"
#include <stdio.h>
#include <errno.h>
#include <sys/types.h>
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/hdrs/test_header.cc
----------------------------------------------------------------------
diff --git a/proxy/hdrs/test_header.cc b/proxy/hdrs/test_header.cc
index 9ddab43..ed3f212 100644
--- a/proxy/hdrs/test_header.cc
+++ b/proxy/hdrs/test_header.cc
@@ -25,11 +25,11 @@
#include <stdlib.h>
#include <string.h>
-#include "Arena.h"
+#include "ts/Arena.h"
#include "HTTP.h"
// #include "Marshal.h"
#include "MIME.h"
-#include "Regex.h"
+#include "ts/Regex.h"
#include "URL.h"
#include "HttpCompat.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/hdrs/test_urlhash.cc
----------------------------------------------------------------------
diff --git a/proxy/hdrs/test_urlhash.cc b/proxy/hdrs/test_urlhash.cc
index 812d7d0..ed9f599 100644
--- a/proxy/hdrs/test_urlhash.cc
+++ b/proxy/hdrs/test_urlhash.cc
@@ -25,10 +25,10 @@
#include <stdlib.h>
#include <string.h>
-#include "Arena.h"
+#include "ts/Arena.h"
#include "HTTP.h"
#include "MIME.h"
-#include "Regex.h"
+#include "ts/Regex.h"
#include "URL.h"
#include "HttpCompat.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/http/HttpBodyFactory.cc
----------------------------------------------------------------------
diff --git a/proxy/http/HttpBodyFactory.cc b/proxy/http/HttpBodyFactory.cc
index 189ca50..4482d5e 100644
--- a/proxy/http/HttpBodyFactory.cc
+++ b/proxy/http/HttpBodyFactory.cc
@@ -28,7 +28,7 @@
****************************************************************************/
-#include "libts.h"
+#include "ts/libts.h"
#include "HttpBodyFactory.h"
#include <unistd.h>
#include <dirent.h>
@@ -39,7 +39,7 @@
#include <logging/LogAccess.h>
#include <logging/LogAccessHttp.h>
#include "HttpCompat.h"
-#include "I_Layout.h"
+#include "ts/I_Layout.h"
//////////////////////////////////////////////////////////////////////
// The HttpBodyFactory creates HTTP response page bodies, supported //
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/http/HttpBodyFactory.h
----------------------------------------------------------------------
diff --git a/proxy/http/HttpBodyFactory.h b/proxy/http/HttpBodyFactory.h
index cd8179f..bcafcbc 100644
--- a/proxy/http/HttpBodyFactory.h
+++ b/proxy/http/HttpBodyFactory.h
@@ -57,14 +57,14 @@
#include <strings.h>
#include <sys/types.h>
-#include "libts.h"
+#include "ts/libts.h"
#include "HTTP.h"
#include "HttpConfig.h"
#include "HttpCompat.h"
#include "HttpTransact.h"
#include "Error.h"
#include "Main.h"
-#include "RawHashTable.h"
+#include "ts/RawHashTable.h"
#define HTTP_BODY_TEMPLATE_MAGIC 0xB0DFAC00
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/http/HttpClientSession.cc
----------------------------------------------------------------------
diff --git a/proxy/http/HttpClientSession.cc b/proxy/http/HttpClientSession.cc
index fe78143..f02834c 100644
--- a/proxy/http/HttpClientSession.cc
+++ b/proxy/http/HttpClientSession.cc
@@ -30,8 +30,8 @@
****************************************************************************/
-#include "ink_config.h"
-#include "Allocator.h"
+#include "ts/ink_config.h"
+#include "ts/Allocator.h"
#include "HttpClientSession.h"
#include "HttpSM.h"
#include "HttpDebugNames.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/http/HttpClientSession.h
----------------------------------------------------------------------
diff --git a/proxy/http/HttpClientSession.h b/proxy/http/HttpClientSession.h
index 684815d..7f8c118 100644
--- a/proxy/http/HttpClientSession.h
+++ b/proxy/http/HttpClientSession.h
@@ -32,7 +32,7 @@
#ifndef _HTTP_CLIENT_SESSION_H_
#define _HTTP_CLIENT_SESSION_H_
-#include "libts.h"
+#include "ts/libts.h"
#include "P_Net.h"
#include "InkAPIInternal.h"
#include "HTTP.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/http/HttpConfig.cc
----------------------------------------------------------------------
diff --git a/proxy/http/HttpConfig.cc b/proxy/http/HttpConfig.cc
index d96b044..27b6508 100644
--- a/proxy/http/HttpConfig.cc
+++ b/proxy/http/HttpConfig.cc
@@ -21,7 +21,7 @@
limitations under the License.
*/
-#include "ink_config.h"
+#include "ts/ink_config.h"
#include <ctype.h>
#include <string.h>
#include "HttpConfig.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/http/HttpConfig.h
----------------------------------------------------------------------
diff --git a/proxy/http/HttpConfig.h b/proxy/http/HttpConfig.h
index 9b39cb6..2d93f70 100644
--- a/proxy/http/HttpConfig.h
+++ b/proxy/http/HttpConfig.h
@@ -41,8 +41,8 @@
#include <ctype.h>
#endif
-#include "libts.h"
-#include "Regex.h"
+#include "ts/libts.h"
+#include "ts/Regex.h"
#include "HttpProxyAPIEnums.h"
#include "ProxyConfig.h"
#include "P_RecProcess.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/http/HttpConnectionCount.h
----------------------------------------------------------------------
diff --git a/proxy/http/HttpConnectionCount.h b/proxy/http/HttpConnectionCount.h
index 8ee4a19..d725ca0 100644
--- a/proxy/http/HttpConnectionCount.h
+++ b/proxy/http/HttpConnectionCount.h
@@ -22,8 +22,8 @@
*/
//
-#include "libts.h"
-#include "Map.h"
+#include "ts/libts.h"
+#include "ts/Map.h"
#ifndef _HTTP_CONNECTION_COUNT_H_
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/http/HttpPages.h
----------------------------------------------------------------------
diff --git a/proxy/http/HttpPages.h b/proxy/http/HttpPages.h
index 69497e3..f009111 100644
--- a/proxy/http/HttpPages.h
+++ b/proxy/http/HttpPages.h
@@ -34,9 +34,9 @@
#ifndef _HTTP_PAGES_H_
#define _HTTP_PAGES_H_
-#include "libts.h"
+#include "ts/libts.h"
#include "P_EventSystem.h"
-#include "DynArray.h"
+#include "ts/DynArray.h"
#include "HTTP.h"
#include "StatPages.h"
#include "HttpSM.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/http/HttpProxyServerMain.cc
----------------------------------------------------------------------
diff --git a/proxy/http/HttpProxyServerMain.cc b/proxy/http/HttpProxyServerMain.cc
index 97b85c5..4d2cd81 100644
--- a/proxy/http/HttpProxyServerMain.cc
+++ b/proxy/http/HttpProxyServerMain.cc
@@ -21,7 +21,7 @@
limitations under the License.
*/
-#include "ink_config.h"
+#include "ts/ink_config.h"
#include "P_Net.h"
#include "Main.h"
#include "Error.h"
@@ -33,7 +33,7 @@
#include "HttpClientSession.h"
#include "HttpPages.h"
#include "HttpTunnel.h"
-#include "Tokenizer.h"
+#include "ts/Tokenizer.h"
#include "P_SSLNextProtocolAccept.h"
#include "ProtocolProbeSessionAccept.h"
#include "SpdySessionAccept.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/http/HttpSM.h
----------------------------------------------------------------------
diff --git a/proxy/http/HttpSM.h b/proxy/http/HttpSM.h
index 9508bbc..504ccdd 100644
--- a/proxy/http/HttpSM.h
+++ b/proxy/http/HttpSM.h
@@ -33,7 +33,7 @@
#ifndef _HTTP_SM_H_
#define _HTTP_SM_H_
-#include "libts.h"
+#include "ts/libts.h"
#include "P_EventSystem.h"
#include "HttpCacheSM.h"
#include "HttpTransact.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/http/HttpServerSession.cc
----------------------------------------------------------------------
diff --git a/proxy/http/HttpServerSession.cc b/proxy/http/HttpServerSession.cc
index 7acaa5e..8e5ce73 100644
--- a/proxy/http/HttpServerSession.cc
+++ b/proxy/http/HttpServerSession.cc
@@ -28,8 +28,8 @@
Description:
****************************************************************************/
-#include "ink_config.h"
-#include "Allocator.h"
+#include "ts/ink_config.h"
+#include "ts/Allocator.h"
#include "HttpServerSession.h"
#include "HttpSessionManager.h"
#include "HttpSM.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/http/HttpSessionAccept.h
----------------------------------------------------------------------
diff --git a/proxy/http/HttpSessionAccept.h b/proxy/http/HttpSessionAccept.h
index 09ff3b5..d368065 100644
--- a/proxy/http/HttpSessionAccept.h
+++ b/proxy/http/HttpSessionAccept.h
@@ -24,7 +24,7 @@
#if !defined(_HttpSessionAccept_h_)
#define _HttpSessionAccept_h_
-#include "libts.h"
+#include "ts/libts.h"
#include "records/I_RecHttp.h"
#include "P_EventSystem.h"
#include "HttpConfig.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/http/HttpTransact.cc
----------------------------------------------------------------------
diff --git a/proxy/http/HttpTransact.cc b/proxy/http/HttpTransact.cc
index fcd0666..ff92198 100644
--- a/proxy/http/HttpTransact.cc
+++ b/proxy/http/HttpTransact.cc
@@ -21,7 +21,7 @@
limitations under the License.
*/
-#include "libts.h"
+#include "ts/libts.h"
#include <strings.h>
#include <math.h>
@@ -32,10 +32,10 @@
#include "HttpCacheSM.h" //Added to get the scope of HttpCacheSM object - YTS Team, yamsat
#include "HttpDebugNames.h"
#include "time.h"
-#include "ParseRules.h"
+#include "ts/ParseRules.h"
#include "HTTP.h"
#include "HdrUtils.h"
-#include "MimeTable.h"
+#include "ts/MimeTable.h"
#include "logging/Log.h"
#include "logging/LogUtils.h"
#include "Error.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/http/HttpTransact.h
----------------------------------------------------------------------
diff --git a/proxy/http/HttpTransact.h b/proxy/http/HttpTransact.h
index 75d2ad4..199c600 100644
--- a/proxy/http/HttpTransact.h
+++ b/proxy/http/HttpTransact.h
@@ -25,7 +25,7 @@
#if !defined(_HttpTransact_h_)
#define _HttpTransact_h_
-#include "libts.h"
+#include "ts/libts.h"
#include "P_HostDB.h"
#include "P_Net.h"
#include "HttpConfig.h"
@@ -109,7 +109,7 @@ struct HttpConfigParams;
struct MimeTableEntry;
class HttpSM;
-#include "InkErrno.h"
+#include "ts/InkErrno.h"
#define UNKNOWN_INTERNAL_ERROR (INK_START_ERRNO - 1)
enum ViaStringIndex_t {
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/http/HttpTransactCache.cc
----------------------------------------------------------------------
diff --git a/proxy/http/HttpTransactCache.cc b/proxy/http/HttpTransactCache.cc
index 66a9583..8317b24 100644
--- a/proxy/http/HttpTransactCache.cc
+++ b/proxy/http/HttpTransactCache.cc
@@ -21,7 +21,7 @@
limitations under the License.
*/
-#include "libts.h"
+#include "ts/libts.h"
#include "HttpTransact.h"
#include "HttpTransactHeaders.h"
@@ -30,7 +30,7 @@
#include "HTTP.h"
#include "HttpCompat.h"
#include "Error.h"
-#include "InkErrno.h"
+#include "ts/InkErrno.h"
ClassAllocator<CacheLookupHttpConfig> CacheLookupHttpConfigAllocator("CacheLookupHttpConfigAllocator");
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/http/HttpTransactCache.h
----------------------------------------------------------------------
diff --git a/proxy/http/HttpTransactCache.h b/proxy/http/HttpTransactCache.h
index bc3b680..d78e141 100644
--- a/proxy/http/HttpTransactCache.h
+++ b/proxy/http/HttpTransactCache.h
@@ -31,7 +31,7 @@
#if !defined(_HttpTransactCache_h_)
#define _HttpTransactCache_h_
-#include "libts.h"
+#include "ts/libts.h"
// This is needed since txn_conf->cache_guaranteed_max_lifetime is currently not
// readily available in the cache. ToDo: We should fix this with TS-1919
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/http/HttpTransactHeaders.cc
----------------------------------------------------------------------
diff --git a/proxy/http/HttpTransactHeaders.cc b/proxy/http/HttpTransactHeaders.cc
index 28cdffc..a0d56a3 100644
--- a/proxy/http/HttpTransactHeaders.cc
+++ b/proxy/http/HttpTransactHeaders.cc
@@ -20,7 +20,7 @@
See the License for the specific language governing permissions and
limitations under the License.
*/
-#include "libts.h"
+#include "ts/libts.h"
#include "HttpTransact.h"
#include "HttpTransactHeaders.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/http/HttpTunnel.cc
----------------------------------------------------------------------
diff --git a/proxy/http/HttpTunnel.cc b/proxy/http/HttpTunnel.cc
index c5eb009..961e225 100644
--- a/proxy/http/HttpTunnel.cc
+++ b/proxy/http/HttpTunnel.cc
@@ -30,12 +30,12 @@
****************************************************************************/
-#include "ink_config.h"
+#include "ts/ink_config.h"
#include "HttpConfig.h"
#include "HttpTunnel.h"
#include "HttpSM.h"
#include "HttpDebugNames.h"
-#include "ParseRules.h"
+#include "ts/ParseRules.h"
static const int min_block_transfer_bytes = 256;
static char const *const CHUNK_HEADER_FMT = "%" PRIx64 "\r\n";
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/http/HttpTunnel.h
----------------------------------------------------------------------
diff --git a/proxy/http/HttpTunnel.h b/proxy/http/HttpTunnel.h
index db760a6..615e386 100644
--- a/proxy/http/HttpTunnel.h
+++ b/proxy/http/HttpTunnel.h
@@ -33,7 +33,7 @@
#ifndef _HTTP_TUNNEL_H_
#define _HTTP_TUNNEL_H_
-#include "libts.h"
+#include "ts/libts.h"
#include "P_EventSystem.h"
// Get rid of any previous definition first... /leif
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/http/HttpUpdateTester.cc
----------------------------------------------------------------------
diff --git a/proxy/http/HttpUpdateTester.cc b/proxy/http/HttpUpdateTester.cc
index bf685e3..469a4dd 100644
--- a/proxy/http/HttpUpdateTester.cc
+++ b/proxy/http/HttpUpdateTester.cc
@@ -23,8 +23,8 @@
#include "HttpUpdateSM.h"
#include "HttpDebugNames.h"
-#include "Diags.h"
-#include "ink_platform.h"
+#include "ts/Diags.h"
+#include "ts/ink_platform.h"
#define MAX_ACTIVE_REQUESTS 5
#define MAX_TOTAL_REQUESTS 100
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/http/Makefile.am
----------------------------------------------------------------------
diff --git a/proxy/http/Makefile.am b/proxy/http/Makefile.am
index 5d94ccc..039f78e 100644
--- a/proxy/http/Makefile.am
+++ b/proxy/http/Makefile.am
@@ -24,8 +24,6 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/proxy \
-I$(top_srcdir)/lib \
-I$(top_srcdir)/lib/records \
- -I$(top_srcdir)/lib/ts \
- -I$(top_builddir)/lib/ts \
-I$(top_srcdir)/mgmt \
-I$(top_srcdir)/mgmt/utils \
-I$(top_srcdir)/proxy/hdrs \
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/http/RegressionHttpTransact.cc
----------------------------------------------------------------------
diff --git a/proxy/http/RegressionHttpTransact.cc b/proxy/http/RegressionHttpTransact.cc
index c238a55..4eb94d9 100644
--- a/proxy/http/RegressionHttpTransact.cc
+++ b/proxy/http/RegressionHttpTransact.cc
@@ -21,7 +21,7 @@
limitations under the License.
*/
-#include "Regression.h"
+#include "ts/Regression.h"
#include "HttpTransact.h"
#include "HttpSM.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/http/TestHttpTransact.cc
----------------------------------------------------------------------
diff --git a/proxy/http/TestHttpTransact.cc b/proxy/http/TestHttpTransact.cc
index 93e132a..15b1809 100644
--- a/proxy/http/TestHttpTransact.cc
+++ b/proxy/http/TestHttpTransact.cc
@@ -23,7 +23,7 @@
#include "HttpNet.h"
#include <iostream.h>
-#include "ink_assert.h"
+#include "ts/ink_assert.h"
#include "DebugStream.h"
#include "IOBuffer.h"
#include "Main.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/http/remap/Makefile.am
----------------------------------------------------------------------
diff --git a/proxy/http/remap/Makefile.am b/proxy/http/remap/Makefile.am
index 75adad5..711e319 100644
--- a/proxy/http/remap/Makefile.am
+++ b/proxy/http/remap/Makefile.am
@@ -20,8 +20,6 @@ AM_CPPFLAGS = \
$(iocore_include_dirs) \
-I$(top_srcdir)/lib \
-I$(top_srcdir)/lib/records \
- -I$(top_srcdir)/lib/ts \
- -I$(top_builddir)/lib/ts \
-I$(top_srcdir)/proxy/api/ts \
-I$(top_srcdir)/proxy \
-I$(top_srcdir)/mgmt \
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/http/remap/RemapConfig.cc
----------------------------------------------------------------------
diff --git a/proxy/http/remap/RemapConfig.cc b/proxy/http/remap/RemapConfig.cc
index 55079e9..512bc9d 100644
--- a/proxy/http/remap/RemapConfig.cc
+++ b/proxy/http/remap/RemapConfig.cc
@@ -24,11 +24,11 @@
#include "RemapConfig.h"
#include "UrlRewrite.h"
#include "ReverseProxy.h"
-#include "I_Layout.h"
+#include "ts/I_Layout.h"
#include "HTTP.h"
-#include "libts.h"
-#include "ink_cap.h"
-#include "ink_file.h"
+#include "ts/libts.h"
+#include "ts/ink_cap.h"
+#include "ts/ink_file.h"
#define modulePrefix "[ReverseProxy]"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/http/remap/RemapPluginInfo.h
----------------------------------------------------------------------
diff --git a/proxy/http/remap/RemapPluginInfo.h b/proxy/http/remap/RemapPluginInfo.h
index 9f2aa1a..3783fd3 100644
--- a/proxy/http/remap/RemapPluginInfo.h
+++ b/proxy/http/remap/RemapPluginInfo.h
@@ -23,7 +23,7 @@
#if !defined(_REMAPPLUGININFO_h_)
#define _REMAPPLUGININFO_h_
-#include "libts.h"
+#include "ts/libts.h"
#include "api/ts/ts.h"
#include "api/ts/remap.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/http/remap/RemapPlugins.h
----------------------------------------------------------------------
diff --git a/proxy/http/remap/RemapPlugins.h b/proxy/http/remap/RemapPlugins.h
index f2dc2b7..7eade67 100644
--- a/proxy/http/remap/RemapPlugins.h
+++ b/proxy/http/remap/RemapPlugins.h
@@ -28,7 +28,7 @@
#if !defined(_REMAPPLUGINS_h_)
#define _REMAPPLUGINS_h_
-#include "libts.h"
+#include "ts/libts.h"
#include "I_EventSystem.h"
#include "RemapProcessor.h"
#include "api/ts/ts.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/http/remap/UrlMapping.cc
----------------------------------------------------------------------
diff --git a/proxy/http/remap/UrlMapping.cc b/proxy/http/remap/UrlMapping.cc
index fac93e8..45651fd 100644
--- a/proxy/http/remap/UrlMapping.cc
+++ b/proxy/http/remap/UrlMapping.cc
@@ -21,10 +21,10 @@
limitations under the License.
*/
-#include "ink_defs.h"
+#include "ts/ink_defs.h"
#include "UrlMapping.h"
#include "I_RecCore.h"
-#include "ink_cap.h"
+#include "ts/ink_cap.h"
/**
*
**/
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/http/remap/UrlMapping.h
----------------------------------------------------------------------
diff --git a/proxy/http/remap/UrlMapping.h b/proxy/http/remap/UrlMapping.h
index 28c9595..88791e6 100644
--- a/proxy/http/remap/UrlMapping.h
+++ b/proxy/http/remap/UrlMapping.h
@@ -24,13 +24,13 @@
#ifndef _URL_MAPPING_H_
#define _URL_MAPPING_H_
-#include "ink_config.h"
+#include "ts/ink_config.h"
#include "AclFiltering.h"
#include "Main.h"
#include "Error.h"
#include "URL.h"
#include "RemapPluginInfo.h"
-#include "Regex.h"
+#include "ts/Regex.h"
static const unsigned int MAX_REMAP_PLUGIN_CHAIN = 10;
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/http/remap/UrlMappingPathIndex.h
----------------------------------------------------------------------
diff --git a/proxy/http/remap/UrlMappingPathIndex.h b/proxy/http/remap/UrlMappingPathIndex.h
index 4b1cad6..a634ded 100644
--- a/proxy/http/remap/UrlMappingPathIndex.h
+++ b/proxy/http/remap/UrlMappingPathIndex.h
@@ -23,13 +23,13 @@
#ifndef _URL_MAPPING_PATH_INDEX_H
#define _URL_MAPPING_PATH_INDEX_H
-#include "libts.h"
+#include "ts/libts.h"
#undef std // FIXME: remove dependancy on the STL
#include <map>
#include "URL.h"
#include "UrlMapping.h"
-#include "Trie.h"
+#include "ts/Trie.h"
class UrlMappingPathIndex
{
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/http/remap/UrlRewrite.cc
----------------------------------------------------------------------
diff --git a/proxy/http/remap/UrlRewrite.cc b/proxy/http/remap/UrlRewrite.cc
index b74171c..422cda3 100644
--- a/proxy/http/remap/UrlRewrite.cc
+++ b/proxy/http/remap/UrlRewrite.cc
@@ -26,7 +26,7 @@
#include "ReverseProxy.h"
#include "UrlMappingPathIndex.h"
#include "RemapConfig.h"
-#include "I_Layout.h"
+#include "ts/I_Layout.h"
#include "HttpSM.h"
#define modulePrefix "[ReverseProxy]"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/http/remap/UrlRewrite.h
----------------------------------------------------------------------
diff --git a/proxy/http/remap/UrlRewrite.h b/proxy/http/remap/UrlRewrite.h
index 0720915..d7a37ae 100644
--- a/proxy/http/remap/UrlRewrite.h
+++ b/proxy/http/remap/UrlRewrite.h
@@ -24,10 +24,10 @@
#ifndef _URL_REWRITE_H_
#define _URL_REWRITE_H_
-#include "ink_config.h"
+#include "ts/ink_config.h"
#include "UrlMapping.h"
#include "HttpTransact.h"
-#include "Regex.h"
+#include "ts/Regex.h"
#define URL_REMAP_FILTER_NONE 0x00000000
#define URL_REMAP_FILTER_REFERER 0x00000001 /* enable "referer" header validation */
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/http/testheaders.cc
----------------------------------------------------------------------
diff --git a/proxy/http/testheaders.cc b/proxy/http/testheaders.cc
index b1bffe8..772f602 100644
--- a/proxy/http/testheaders.cc
+++ b/proxy/http/testheaders.cc
@@ -21,7 +21,7 @@
limitations under the License.
*/
-#include "ink_string.h"
+#include "ts/ink_string.h"
#include "HttpTransact.h"
#include "HttpTransactHeaders.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/http2/HPACK.h
----------------------------------------------------------------------
diff --git a/proxy/http2/HPACK.h b/proxy/http2/HPACK.h
index 4e63a37..aec28bb 100644
--- a/proxy/http2/HPACK.h
+++ b/proxy/http2/HPACK.h
@@ -24,7 +24,7 @@
#ifndef __HPACK_H__
#define __HPACK_H__
-#include "libts.h"
+#include "ts/libts.h"
#include "HTTP.h"
// Constant strings for pseudo headers of HPACK
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/http2/HTTP2.cc
----------------------------------------------------------------------
diff --git a/proxy/http2/HTTP2.cc b/proxy/http2/HTTP2.cc
index bfb494c..e7db7cb 100644
--- a/proxy/http2/HTTP2.cc
+++ b/proxy/http2/HTTP2.cc
@@ -24,7 +24,7 @@
#include "HTTP2.h"
#include "HPACK.h"
#include "HuffmanCodec.h"
-#include "ink_assert.h"
+#include "ts/ink_assert.h"
#include "P_RecCore.h"
#include "P_RecProcess.h"
@@ -789,7 +789,7 @@ Http2::init()
#if TS_HAS_TESTS
-#include "TestBox.h"
+#include "ts/TestBox.h"
// Constants for regression test
const static int BUFSIZE_FOR_REGRESSION_TEST = 128;
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/http2/HTTP2.h
----------------------------------------------------------------------
diff --git a/proxy/http2/HTTP2.h b/proxy/http2/HTTP2.h
index 97b187d..bdaf6f2 100644
--- a/proxy/http2/HTTP2.h
+++ b/proxy/http2/HTTP2.h
@@ -24,8 +24,8 @@
#ifndef __HTTP2_H__
#define __HTTP2_H__
-#include "ink_defs.h"
-#include "ink_memory.h"
+#include "ts/ink_defs.h"
+#include "ts/ink_memory.h"
#include "HPACK.h"
#include "MIME.h"
#include "P_RecDefs.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/http2/Http2SessionAccept.h
----------------------------------------------------------------------
diff --git a/proxy/http2/Http2SessionAccept.h b/proxy/http2/Http2SessionAccept.h
index 6d6fce0..3d9ba22 100644
--- a/proxy/http2/Http2SessionAccept.h
+++ b/proxy/http2/Http2SessionAccept.h
@@ -24,7 +24,7 @@
#ifndef __HTTP2_SESSION_ACCEPT_H__
#define __HTTP2_SESSION_ACCEPT_H__
-#include "libts.h"
+#include "ts/libts.h"
#include "I_Net.h"
// XXX HttpSessionAccept::Options needs to be refactored and separated from HttpSessionAccept so that
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/http2/HuffmanCodec.cc
----------------------------------------------------------------------
diff --git a/proxy/http2/HuffmanCodec.cc b/proxy/http2/HuffmanCodec.cc
index 0efe589..08d4717 100644
--- a/proxy/http2/HuffmanCodec.cc
+++ b/proxy/http2/HuffmanCodec.cc
@@ -22,7 +22,7 @@
*/
#include "HuffmanCodec.h"
-#include "libts.h"
+#include "ts/libts.h"
struct huffman_entry {
uint32_t code_as_hex;
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/http2/Makefile.am
----------------------------------------------------------------------
diff --git a/proxy/http2/Makefile.am b/proxy/http2/Makefile.am
index b8c74d0..76fa41c 100644
--- a/proxy/http2/Makefile.am
+++ b/proxy/http2/Makefile.am
@@ -21,8 +21,6 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/proxy/api/ts \
-I$(top_srcdir)/lib \
-I$(top_srcdir)/lib/records \
- -I$(top_srcdir)/lib/ts \
- -I$(top_builddir)/lib/ts \
-I$(top_srcdir)/mgmt \
-I$(top_srcdir)/mgmt/utils \
-I$(top_srcdir)/proxy \
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/logcat.cc
----------------------------------------------------------------------
diff --git a/proxy/logcat.cc b/proxy/logcat.cc
index 1133c07..3113b5d 100644
--- a/proxy/logcat.cc
+++ b/proxy/logcat.cc
@@ -21,8 +21,8 @@
limitations under the License.
*/
-#include "libts.h"
-#include "I_Layout.h"
+#include "ts/libts.h"
+#include "ts/I_Layout.h"
#define PROGRAM_NAME "traffic_logcat"
#define MAX_LOGBUFFER_SIZE 65536
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/logging/Log.cc
----------------------------------------------------------------------
diff --git a/proxy/logging/Log.cc b/proxy/logging/Log.cc
index 512ca9c..1c8cc25 100644
--- a/proxy/logging/Log.cc
+++ b/proxy/logging/Log.cc
@@ -32,7 +32,7 @@
class.
***************************************************************************/
-#include "libts.h"
+#include "ts/libts.h"
#include "Error.h"
#include "Main.h"
@@ -53,9 +53,9 @@
#include "LogUtils.h"
#include "Log.h"
#include "LogSock.h"
-#include "SimpleTokenizer.h"
+#include "ts/SimpleTokenizer.h"
-#include "ink_apidefs.h"
+#include "ts/ink_apidefs.h"
#define PERIODIC_TASKS_INTERVAL_FALLBACK 5
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/logging/Log.h
----------------------------------------------------------------------
diff --git a/proxy/logging/Log.h b/proxy/logging/Log.h
index a2ff117..552a8db 100644
--- a/proxy/logging/Log.h
+++ b/proxy/logging/Log.h
@@ -294,7 +294,7 @@
#define LOG_H
#include <stdarg.h>
-#include "libts.h"
+#include "ts/libts.h"
#include "P_RecProcess.h"
#include "LogFile.h"
#include "LogBuffer.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/logging/LogAccess.cc
----------------------------------------------------------------------
diff --git a/proxy/logging/LogAccess.cc b/proxy/logging/LogAccess.cc
index 65c71f8..0e66493 100644
--- a/proxy/logging/LogAccess.cc
+++ b/proxy/logging/LogAccess.cc
@@ -31,7 +31,7 @@
to provide support for marshalling and unmarshalling support for the other
LogAccess derived classes.
*/
-#include "libts.h"
+#include "ts/libts.h"
#include "Error.h"
#include "HTTP.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/logging/LogAccess.h
----------------------------------------------------------------------
diff --git a/proxy/logging/LogAccess.h b/proxy/logging/LogAccess.h
index 16d5f33..c9c176d 100644
--- a/proxy/logging/LogAccess.h
+++ b/proxy/logging/LogAccess.h
@@ -28,7 +28,7 @@
***************************************************************************/
#ifndef LOG_ACCESS_H
#define LOG_ACCESS_H
-#include "libts.h"
+#include "ts/libts.h"
#include "LogField.h"
/*-------------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/logging/LogAccessHttp.cc
----------------------------------------------------------------------
diff --git a/proxy/logging/LogAccessHttp.cc b/proxy/logging/LogAccessHttp.cc
index d34d449..de9ec73 100644
--- a/proxy/logging/LogAccessHttp.cc
+++ b/proxy/logging/LogAccessHttp.cc
@@ -30,7 +30,7 @@
***************************************************************************/
-#include "libts.h"
+#include "ts/libts.h"
#include "Error.h"
#include "LogAccessHttp.h"
#include "http/HttpSM.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/logging/LogAccessHttp.h
----------------------------------------------------------------------
diff --git a/proxy/logging/LogAccessHttp.h b/proxy/logging/LogAccessHttp.h
index f7daf4a..984794d 100644
--- a/proxy/logging/LogAccessHttp.h
+++ b/proxy/logging/LogAccessHttp.h
@@ -25,7 +25,7 @@
#ifndef LOG_ACCESS_HTTP_H
#define LOG_ACCESS_HTTP_H
-#include "Arena.h"
+#include "ts/Arena.h"
#include "HTTP.h"
#include "LogAccess.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/logging/LogAccessICP.cc
----------------------------------------------------------------------
diff --git a/proxy/logging/LogAccessICP.cc b/proxy/logging/LogAccessICP.cc
index e7b20d9..9cf31ba 100644
--- a/proxy/logging/LogAccessICP.cc
+++ b/proxy/logging/LogAccessICP.cc
@@ -31,7 +31,7 @@
***************************************************************************/
-#include "libts.h"
+#include "ts/libts.h"
#include "Error.h"
#include "HTTP.h"
#include "ICP.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/logging/LogBuffer.cc
----------------------------------------------------------------------
diff --git a/proxy/logging/LogBuffer.cc b/proxy/logging/LogBuffer.cc
index 6292498..2e03c3b 100644
--- a/proxy/logging/LogBuffer.cc
+++ b/proxy/logging/LogBuffer.cc
@@ -25,7 +25,7 @@
recording log entries. See the header file LogBuffer.h for more
information on the structure of a LogBuffer.
*/
-#include "libts.h"
+#include "ts/libts.h"
#include <stdio.h>
#include <stdlib.h>
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/logging/LogBuffer.h
----------------------------------------------------------------------
diff --git a/proxy/logging/LogBuffer.h b/proxy/logging/LogBuffer.h
index 160aac0..8463f64 100644
--- a/proxy/logging/LogBuffer.h
+++ b/proxy/logging/LogBuffer.h
@@ -25,7 +25,7 @@
#ifndef LOG_BUFFER_H
#define LOG_BUFFER_H
-#include "libts.h"
+#include "ts/libts.h"
#include "LogFormat.h"
#include "LogLimits.h"
#include "LogAccess.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/logging/LogCollationAccept.cc
----------------------------------------------------------------------
diff --git a/proxy/logging/LogCollationAccept.cc b/proxy/logging/LogCollationAccept.cc
index 605de41..0dedc92 100644
--- a/proxy/logging/LogCollationAccept.cc
+++ b/proxy/logging/LogCollationAccept.cc
@@ -25,7 +25,7 @@
// include files
//-------------------------------------------------------------------------
-#include "libts.h"
+#include "ts/libts.h"
#include "P_EventSystem.h"
#include "Log.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/logging/LogCollationClientSM.cc
----------------------------------------------------------------------
diff --git a/proxy/logging/LogCollationClientSM.cc b/proxy/logging/LogCollationClientSM.cc
index 21cfa76..ac00aa0 100644
--- a/proxy/logging/LogCollationClientSM.cc
+++ b/proxy/logging/LogCollationClientSM.cc
@@ -25,7 +25,7 @@
// include files
//-------------------------------------------------------------------------
-#include "libts.h"
+#include "ts/libts.h"
#include <stdio.h>
#include <stdlib.h>
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/logging/LogCollationHostSM.cc
----------------------------------------------------------------------
diff --git a/proxy/logging/LogCollationHostSM.cc b/proxy/logging/LogCollationHostSM.cc
index dc73d87..75e9512 100644
--- a/proxy/logging/LogCollationHostSM.cc
+++ b/proxy/logging/LogCollationHostSM.cc
@@ -25,7 +25,7 @@
// include files
//-------------------------------------------------------------------------
-#include "ink_config.h"
+#include "ts/ink_config.h"
#include <stdio.h>
#include <stdlib.h>
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/logging/LogConfig.cc
----------------------------------------------------------------------
diff --git a/proxy/logging/LogConfig.cc b/proxy/logging/LogConfig.cc
index 7b59792..fdccf4c 100644
--- a/proxy/logging/LogConfig.cc
+++ b/proxy/logging/LogConfig.cc
@@ -21,18 +21,18 @@
limitations under the License.
*/
-#include "libts.h"
-#include "I_Layout.h"
+#include "ts/libts.h"
+#include "ts/I_Layout.h"
#ifdef HAVE_SYS_PARAM_H
#include <sys/param.h>
#endif
-#include "ink_platform.h"
-#include "ink_file.h"
+#include "ts/ink_platform.h"
+#include "ts/ink_file.h"
#include "Main.h"
-#include "List.h"
+#include "ts/List.h"
#include "InkXml.h"
#include "Log.h"
@@ -45,7 +45,7 @@
#include "LogObject.h"
#include "LogConfig.h"
#include "LogUtils.h"
-#include "SimpleTokenizer.h"
+#include "ts/SimpleTokenizer.h"
#include "LogCollationAccept.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/logging/LogConfig.h
----------------------------------------------------------------------
diff --git a/proxy/logging/LogConfig.h b/proxy/logging/LogConfig.h
index 6143d91..c7e18ac 100644
--- a/proxy/logging/LogConfig.h
+++ b/proxy/logging/LogConfig.h
@@ -25,7 +25,7 @@
#ifndef LOG_CONFIG_H
#define LOG_CONFIG_H
-#include "libts.h"
+#include "ts/libts.h"
#include "P_RecProcess.h"
#include "ProxyConfig.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/logging/LogField.cc
----------------------------------------------------------------------
diff --git a/proxy/logging/LogField.cc b/proxy/logging/LogField.cc
index eb90e8d..37008cd 100644
--- a/proxy/logging/LogField.cc
+++ b/proxy/logging/LogField.cc
@@ -27,7 +27,7 @@
This file implements the LogField object, which is the central
representation of a logging field.
***************************************************************************/
-#include "libts.h"
+#include "ts/libts.h"
#include "Error.h"
#include "LogUtils.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/logging/LogField.h
----------------------------------------------------------------------
diff --git a/proxy/logging/LogField.h b/proxy/logging/LogField.h
index 29ab7a9..27fad8e 100644
--- a/proxy/logging/LogField.h
+++ b/proxy/logging/LogField.h
@@ -25,7 +25,7 @@
#ifndef LOG_FIELD_H
#define LOG_FIELD_H
-#include "libts.h"
+#include "ts/libts.h"
#include "LogFieldAliasMap.h"
#include "StatSystem.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/logging/LogFieldAliasMap.cc
----------------------------------------------------------------------
diff --git a/proxy/logging/LogFieldAliasMap.cc b/proxy/logging/LogFieldAliasMap.cc
index 21c4cb2..ad2d53c 100644
--- a/proxy/logging/LogFieldAliasMap.cc
+++ b/proxy/logging/LogFieldAliasMap.cc
@@ -27,9 +27,9 @@
***************************************************************************/
-#include "ink_config.h"
+#include "ts/ink_config.h"
#include "LogFieldAliasMap.h"
-#include "ink_assert.h"
+#include "ts/ink_assert.h"
void
LogFieldAliasTable::init(size_t numPairs, ...)
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/logging/LogFieldAliasMap.h
----------------------------------------------------------------------
diff --git a/proxy/logging/LogFieldAliasMap.h b/proxy/logging/LogFieldAliasMap.h
index e355232..4df1e8d 100644
--- a/proxy/logging/LogFieldAliasMap.h
+++ b/proxy/logging/LogFieldAliasMap.h
@@ -33,10 +33,10 @@
#include <stdarg.h>
#include <string.h>
-#include "libts.h"
-#include "Ptr.h"
+#include "ts/libts.h"
+#include "ts/Ptr.h"
#include "LogUtils.h"
-#include "ink_string.h"
+#include "ts/ink_string.h"
/*****************************************************************************
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/logging/LogFile.cc
----------------------------------------------------------------------
diff --git a/proxy/logging/LogFile.cc b/proxy/logging/LogFile.cc
index 63730c4..920e7be 100644
--- a/proxy/logging/LogFile.cc
+++ b/proxy/logging/LogFile.cc
@@ -27,7 +27,7 @@
***************************************************************************/
-#include "libts.h"
+#include "ts/libts.h"
#include <errno.h>
#include <sys/types.h>
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/logging/LogFile.h
----------------------------------------------------------------------
diff --git a/proxy/logging/LogFile.h b/proxy/logging/LogFile.h
index 6b2441f..1f127c2 100644
--- a/proxy/logging/LogFile.h
+++ b/proxy/logging/LogFile.h
@@ -28,7 +28,7 @@
#include <stdarg.h>
#include <stdio.h>
-#include "libts.h"
+#include "ts/libts.h"
#include "LogBufferSink.h"
class LogSock;
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/logging/LogFilter.cc
----------------------------------------------------------------------
diff --git a/proxy/logging/LogFilter.cc b/proxy/logging/LogFilter.cc
index abdf66f..a266c1a 100644
--- a/proxy/logging/LogFilter.cc
+++ b/proxy/logging/LogFilter.cc
@@ -26,7 +26,7 @@
***************************************************************************/
-#include "libts.h"
+#include "ts/libts.h"
#include "Error.h"
#include "LogUtils.h"
@@ -39,8 +39,8 @@
#include "LogObject.h"
#include "LogConfig.h"
#include "Log.h"
-//#include "ink_ctype.h"
-#include "SimpleTokenizer.h"
+//#include "ts/ink_ctype.h"
+#include "ts/SimpleTokenizer.h"
const char *LogFilter::OPERATOR_NAME[] = {"MATCH", "CASE_INSENSITIVE_MATCH", "CONTAIN", "CASE_INSENSITIVE_CONTAIN"};
const char *LogFilter::ACTION_NAME[] = {"REJECT", "ACCEPT", "WIPE_FIELD_VALUE"};
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/logging/LogFilter.h
----------------------------------------------------------------------
diff --git a/proxy/logging/LogFilter.h b/proxy/logging/LogFilter.h
index 8a82a68..7102bba 100644
--- a/proxy/logging/LogFilter.h
+++ b/proxy/logging/LogFilter.h
@@ -25,8 +25,8 @@
#ifndef LOG_FILTER_H
#define LOG_FILTER_H
-#include "libts.h"
-#include "IpMap.h"
+#include "ts/libts.h"
+#include "ts/IpMap.h"
#include "LogAccess.h"
#include "LogField.h"
#include "LogFormat.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/logging/LogFormat.cc
----------------------------------------------------------------------
diff --git a/proxy/logging/LogFormat.cc b/proxy/logging/LogFormat.cc
index 069211c..4d0abff 100644
--- a/proxy/logging/LogFormat.cc
+++ b/proxy/logging/LogFormat.cc
@@ -26,16 +26,16 @@
***************************************************************************/
-#include "ink_config.h"
+#include "ts/ink_config.h"
#include <stdio.h>
#include <string.h>
#include <stdlib.h>
-#include "INK_MD5.h"
+#include "ts/INK_MD5.h"
#include "Error.h"
-#include "SimpleTokenizer.h"
+#include "ts/SimpleTokenizer.h"
#include "LogUtils.h"
#include "LogFile.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/logging/LogFormat.h
----------------------------------------------------------------------
diff --git a/proxy/logging/LogFormat.h b/proxy/logging/LogFormat.h
index 39ee864..e910ecc 100644
--- a/proxy/logging/LogFormat.h
+++ b/proxy/logging/LogFormat.h
@@ -26,7 +26,7 @@
#define LOG_FIELD_MARKER '\377'
-#include "libts.h"
+#include "ts/libts.h"
#include "LogField.h"
#include "InkXml.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/logging/LogHost.cc
----------------------------------------------------------------------
diff --git a/proxy/logging/LogHost.cc b/proxy/logging/LogHost.cc
index 8e7b0a3..4767cc0 100644
--- a/proxy/logging/LogHost.cc
+++ b/proxy/logging/LogHost.cc
@@ -26,7 +26,7 @@
***************************************************************************/
-#include "libts.h"
+#include "ts/libts.h"
#include "Error.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/logging/LogObject.cc
----------------------------------------------------------------------
diff --git a/proxy/logging/LogObject.cc b/proxy/logging/LogObject.cc
index e3e8589..77fe808 100644
--- a/proxy/logging/LogObject.cc
+++ b/proxy/logging/LogObject.cc
@@ -26,7 +26,7 @@
***************************************************************************/
-#include "libts.h"
+#include "ts/libts.h"
#include "Error.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/logging/LogObject.h
----------------------------------------------------------------------
diff --git a/proxy/logging/LogObject.h b/proxy/logging/LogObject.h
index 649ad4f..3d6fe4d 100644
--- a/proxy/logging/LogObject.h
+++ b/proxy/logging/LogObject.h
@@ -25,7 +25,7 @@
#ifndef LOG_OBJECT_H
#define LOG_OBJECT_H
-#include "libts.h"
+#include "ts/libts.h"
#include "Log.h"
#include "LogFile.h"
#include "LogFormat.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/logging/LogSock.h
----------------------------------------------------------------------
diff --git a/proxy/logging/LogSock.h b/proxy/logging/LogSock.h
index a80cf2b..1bf5118 100644
--- a/proxy/logging/LogSock.h
+++ b/proxy/logging/LogSock.h
@@ -25,7 +25,7 @@
#ifndef LOG_SOCK_H
#define LOG_SOCK_H
-#include "libts.h"
+#include "ts/libts.h"
/*-------------------------------------------------------------------------
LogSock
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/logging/LogStandalone.cc
----------------------------------------------------------------------
diff --git a/proxy/logging/LogStandalone.cc b/proxy/logging/LogStandalone.cc
index ebac47c..4b74479 100644
--- a/proxy/logging/LogStandalone.cc
+++ b/proxy/logging/LogStandalone.cc
@@ -27,9 +27,9 @@
***************************************************************************/
-#include "libts.h"
-#include "ink_sys_control.h"
-#include "signals.h"
+#include "ts/libts.h"
+#include "ts/ink_sys_control.h"
+#include "ts/signals.h"
#include "DiagsConfig.h"
#include "Main.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/logging/LogUtils.cc
----------------------------------------------------------------------
diff --git a/proxy/logging/LogUtils.cc b/proxy/logging/LogUtils.cc
index 4099f54..1aac724 100644
--- a/proxy/logging/LogUtils.cc
+++ b/proxy/logging/LogUtils.cc
@@ -21,7 +21,7 @@
See the License for the specific language governing permissions and
limitations under the License.
*/
-#include "ink_config.h"
+#include "ts/ink_config.h"
#include <assert.h>
#include <stdio.h>
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/logging/LogUtils.h
----------------------------------------------------------------------
diff --git a/proxy/logging/LogUtils.h b/proxy/logging/LogUtils.h
index 2b8b533..3d815b5a 100644
--- a/proxy/logging/LogUtils.h
+++ b/proxy/logging/LogUtils.h
@@ -25,8 +25,8 @@
#include "time.h"
-#include "libts.h"
-#include "Arena.h"
+#include "ts/libts.h"
+#include "ts/Arena.h"
namespace LogUtils
{
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/logging/Makefile.am
----------------------------------------------------------------------
diff --git a/proxy/logging/Makefile.am b/proxy/logging/Makefile.am
index f8220f9..bfcd942 100644
--- a/proxy/logging/Makefile.am
+++ b/proxy/logging/Makefile.am
@@ -20,8 +20,6 @@ AM_CPPFLAGS = \
$(iocore_include_dirs) \
-I$(top_srcdir)/lib \
-I$(top_srcdir)/lib/records \
- -I$(top_srcdir)/lib/ts \
- -I$(top_builddir)/lib/ts \
-I$(top_srcdir)/proxy/api/ts \
-I$(top_srcdir)/proxy \
-I$(top_srcdir)/proxy/http \
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/logstats.cc
----------------------------------------------------------------------
diff --git a/proxy/logstats.cc b/proxy/logstats.cc
index 7c24eb3..9e73bc3 100644
--- a/proxy/logstats.cc
+++ b/proxy/logstats.cc
@@ -21,12 +21,12 @@
limitations under the License.
*/
-#include "libts.h"
+#include "ts/libts.h"
#undef std // FIXME: remove dependency on the STL
-#include "ink_config.h"
-#include "ink_file.h"
-#include "I_Layout.h"
-#include "I_Version.h"
+#include "ts/ink_config.h"
+#include "ts/ink_file.h"
+#include "ts/I_Layout.h"
+#include "ts/I_Version.h"
// Includes and namespaces etc.
#include "LogStandalone.cc"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/sac.cc
----------------------------------------------------------------------
diff --git a/proxy/sac.cc b/proxy/sac.cc
index d6862a7..6d6bd0d 100644
--- a/proxy/sac.cc
+++ b/proxy/sac.cc
@@ -21,8 +21,8 @@
limitations under the License.
*/
-#include "libts.h"
-#include "I_Layout.h"
+#include "ts/libts.h"
+#include "ts/I_Layout.h"
#include "P_Net.h"
#define PROGRAM_NAME "traffic_sac"
[5/7] trafficserver git commit: TS-3759 Eliminate -Ilib/ts
Posted by zw...@apache.org.
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/iocore/net/SSLNetVConnection.cc
----------------------------------------------------------------------
diff --git a/iocore/net/SSLNetVConnection.cc b/iocore/net/SSLNetVConnection.cc
index 7c6207a..d6fc98b 100644
--- a/iocore/net/SSLNetVConnection.cc
+++ b/iocore/net/SSLNetVConnection.cc
@@ -20,7 +20,7 @@
See the License for the specific language governing permissions and
limitations under the License.
*/
-#include "ink_config.h"
+#include "ts/ink_config.h"
#include "records/I_RecHttp.h"
#include "P_Net.h"
#include "P_SSLNextProtocolSet.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/iocore/net/SSLNextProtocolSet.cc
----------------------------------------------------------------------
diff --git a/iocore/net/SSLNextProtocolSet.cc b/iocore/net/SSLNextProtocolSet.cc
index 454f336..31c2b8f 100644
--- a/iocore/net/SSLNextProtocolSet.cc
+++ b/iocore/net/SSLNextProtocolSet.cc
@@ -21,9 +21,9 @@
limitations under the License.
*/
-#include "ink_config.h"
-#include "apidefs.h"
-#include "libts.h"
+#include "ts/ink_config.h"
+#include "ts/apidefs.h"
+#include "ts/libts.h"
#include "P_SSLNextProtocolSet.h"
// For currently defined protocol strings, see
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/iocore/net/SSLSessionCache.h
----------------------------------------------------------------------
diff --git a/iocore/net/SSLSessionCache.h b/iocore/net/SSLSessionCache.h
index 15a0a3f..135b2dd 100644
--- a/iocore/net/SSLSessionCache.h
+++ b/iocore/net/SSLSessionCache.h
@@ -22,15 +22,15 @@
#ifndef __SSLSESSIONCACHE_H__
#define __SSLSESSIONCACHE_H__
-#include "Map.h"
-#include "List.h"
-#include "ink_mutex.h"
+#include "ts/Map.h"
+#include "ts/List.h"
+#include "ts/ink_mutex.h"
#include "P_EventSystem.h"
#include "P_AIO.h"
#include "I_RecProcess.h"
-#include "libts.h"
+#include "ts/libts.h"
#include "P_SSLUtils.h"
-#include "RbTree.h"
+#include "ts/RbTree.h"
#include <openssl/ssl.h>
#define SSL_MAX_SESSION_SIZE 256
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/iocore/net/SSLUtils.cc
----------------------------------------------------------------------
diff --git a/iocore/net/SSLUtils.cc b/iocore/net/SSLUtils.cc
index eda962b..4b42df6 100644
--- a/iocore/net/SSLUtils.cc
+++ b/iocore/net/SSLUtils.cc
@@ -19,12 +19,12 @@
limitations under the License.
*/
-#include "ink_config.h"
+#include "ts/ink_config.h"
#include "records/I_RecHttp.h"
-#include "libts.h"
-#include "I_Layout.h"
+#include "ts/libts.h"
+#include "ts/I_Layout.h"
#include "P_Net.h"
-#include "ink_cap.h"
+#include "ts/ink_cap.h"
#include "P_OCSPStapling.h"
#include "SSLSessionCache.h"
#include "SSLDynlock.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/iocore/net/Socks.cc
----------------------------------------------------------------------
diff --git a/iocore/net/Socks.cc b/iocore/net/Socks.cc
index a0350f6..08239e8 100644
--- a/iocore/net/Socks.cc
+++ b/iocore/net/Socks.cc
@@ -31,7 +31,7 @@
*/
#include "P_Net.h"
-#include "I_Layout.h"
+#include "ts/I_Layout.h"
#include <ts/IpMapConf.h>
socks_conf_struct *g_socks_conf_stuff = 0;
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/iocore/net/UnixNetPages.cc
----------------------------------------------------------------------
diff --git a/iocore/net/UnixNetPages.cc b/iocore/net/UnixNetPages.cc
index c1d9f74..41a286d 100644
--- a/iocore/net/UnixNetPages.cc
+++ b/iocore/net/UnixNetPages.cc
@@ -21,7 +21,7 @@
limitations under the License.
*/
-#include "libts.h"
+#include "ts/libts.h"
#include "P_Net.h"
#include "Show.h"
#include "I_Tasks.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/iocore/net/UnixNetVConnection.cc
----------------------------------------------------------------------
diff --git a/iocore/net/UnixNetVConnection.cc b/iocore/net/UnixNetVConnection.cc
index ecfd3bf..c3d7540 100644
--- a/iocore/net/UnixNetVConnection.cc
+++ b/iocore/net/UnixNetVConnection.cc
@@ -22,7 +22,7 @@
*/
#include "P_Net.h"
-#include "libts.h"
+#include "ts/libts.h"
#include "Log.h"
#define STATE_VIO_OFFSET ((uintptr_t) & ((NetState *)0)->vio)
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/iocore/net/test_I_UDPNet.cc
----------------------------------------------------------------------
diff --git a/iocore/net/test_I_UDPNet.cc b/iocore/net/test_I_UDPNet.cc
index 37b0952..81d4a77 100644
--- a/iocore/net/test_I_UDPNet.cc
+++ b/iocore/net/test_I_UDPNet.cc
@@ -25,7 +25,7 @@
#include <stdlib.h>
#include "I_Net.h"
-#include "List.h"
+#include "ts/List.h"
// Diags stuff from test_I_Net.cc:
Diags *diags;
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/iocore/net/test_P_UDPNet.cc
----------------------------------------------------------------------
diff --git a/iocore/net/test_P_UDPNet.cc b/iocore/net/test_P_UDPNet.cc
index 751fe18..76ee379 100644
--- a/iocore/net/test_P_UDPNet.cc
+++ b/iocore/net/test_P_UDPNet.cc
@@ -25,7 +25,7 @@
#include <stdlib.h>
#include "P_Net.h"
-#include "libts.h"
+#include "ts/libts.h"
// Diags stuff from test_I_Net.cc:
Diags *diags;
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/iocore/utils/Machine.cc
----------------------------------------------------------------------
diff --git a/iocore/utils/Machine.cc b/iocore/utils/Machine.cc
index 7d3ace1..9af5551 100644
--- a/iocore/utils/Machine.cc
+++ b/iocore/utils/Machine.cc
@@ -21,7 +21,7 @@
limitations under the License.
*/
-#include "libts.h"
+#include "ts/libts.h"
#include "I_Machine.h"
#if HAVE_IFADDRS_H
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/iocore/utils/Makefile.am
----------------------------------------------------------------------
diff --git a/iocore/utils/Makefile.am b/iocore/utils/Makefile.am
index fc95e06..04eb284 100644
--- a/iocore/utils/Makefile.am
+++ b/iocore/utils/Makefile.am
@@ -19,8 +19,6 @@
AM_CPPFLAGS = \
-I$(top_srcdir)/lib \
-I$(top_srcdir)/lib/records \
- -I$(top_srcdir)/lib/ts \
- -I$(top_builddir)/lib/ts \
-I$(top_srcdir)/iocore/eventsystem
noinst_LIBRARIES = libinkutils.a
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/lib/atscppapi/src/Makefile.am
----------------------------------------------------------------------
diff --git a/lib/atscppapi/src/Makefile.am b/lib/atscppapi/src/Makefile.am
index 64abfd7..300cf06 100644
--- a/lib/atscppapi/src/Makefile.am
+++ b/lib/atscppapi/src/Makefile.am
@@ -15,12 +15,12 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-TS_PLUGIN_CPPFLAGS = \
+AM_CPPFLAGS = \
+ -I$(top_srcdir)/$(subdir)/include \
+ -I$(top_builddir)/proxy/api \
-I$(top_srcdir)/proxy/api \
- -I$(top_builddir)/lib/ts \
- -I$(top_srcdir)/lib/ts
+ -I$(top_srcdir)/lib
-AM_CXXFLAGS = -I$(top_srcdir)/$(subdir)/include $(TS_PLUGIN_CPPFLAGS)
# build the library
lib_LTLIBRARIES = libatscppapi.la
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/lib/atscppapi/src/Transaction.cc
----------------------------------------------------------------------
diff --git a/lib/atscppapi/src/Transaction.cc b/lib/atscppapi/src/Transaction.cc
index 1f01b7f..7361cbd 100644
--- a/lib/atscppapi/src/Transaction.cc
+++ b/lib/atscppapi/src/Transaction.cc
@@ -25,7 +25,7 @@
#include <cstring>
#include <map>
#include <string>
-#include <ink_memory.h>
+#include "ts/ink_memory.h"
#include "atscppapi/shared_ptr.h"
#include "logging_internal.h"
#include "utils_internal.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/lib/records/I_RecCore.h
----------------------------------------------------------------------
diff --git a/lib/records/I_RecCore.h b/lib/records/I_RecCore.h
index a09abdf..719021f 100644
--- a/lib/records/I_RecCore.h
+++ b/lib/records/I_RecCore.h
@@ -24,7 +24,7 @@
#ifndef _I_REC_CORE_H_
#define _I_REC_CORE_H_
-#include "Diags.h"
+#include "ts/Diags.h"
#include "I_RecDefs.h"
#include "I_RecAlarms.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/lib/records/I_RecDefs.h
----------------------------------------------------------------------
diff --git a/lib/records/I_RecDefs.h b/lib/records/I_RecDefs.h
index 839bcd7..c0317dd 100644
--- a/lib/records/I_RecDefs.h
+++ b/lib/records/I_RecDefs.h
@@ -24,8 +24,8 @@
#ifndef _I_REC_DEFS_H_
#define _I_REC_DEFS_H_
-#include "ink_mutex.h"
-#include "ink_rwlock.h"
+#include "ts/ink_mutex.h"
+#include "ts/ink_rwlock.h"
#include "I_RecMutex.h"
#define STAT_PROCESSOR
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/lib/records/I_RecMutex.h
----------------------------------------------------------------------
diff --git a/lib/records/I_RecMutex.h b/lib/records/I_RecMutex.h
index 1d6d498..6067439 100644
--- a/lib/records/I_RecMutex.h
+++ b/lib/records/I_RecMutex.h
@@ -24,8 +24,8 @@
#ifndef _I_REC_MUTEX_H_
#define _I_REC_MUTEX_H_
-#include "ink_mutex.h"
-#include "ink_thread.h"
+#include "ts/ink_mutex.h"
+#include "ts/ink_thread.h"
/**
A wrapper to ink_mutex class. It allows multiple acquire of mutex lock
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/lib/records/Makefile.am
----------------------------------------------------------------------
diff --git a/lib/records/Makefile.am b/lib/records/Makefile.am
index b38e279..2306d48 100644
--- a/lib/records/Makefile.am
+++ b/lib/records/Makefile.am
@@ -22,9 +22,7 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/mgmt \
-I$(top_srcdir)/mgmt/api/include \
-I$(top_srcdir)/mgmt/utils \
- -I$(top_srcdir)/lib \
- -I$(top_srcdir)/lib/ts \
- -I$(top_builddir)/lib/ts
+ -I$(top_srcdir)/lib
noinst_LIBRARIES = librecords_lm.a librecords_p.a librecords_cop.a
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/lib/records/P_RecCore.cc
----------------------------------------------------------------------
diff --git a/lib/records/P_RecCore.cc b/lib/records/P_RecCore.cc
index ae4d2df..6eede2d 100644
--- a/lib/records/P_RecCore.cc
+++ b/lib/records/P_RecCore.cc
@@ -21,12 +21,12 @@
limitations under the License.
*/
-#include "libts.h"
+#include "ts/libts.h"
-#include "TextBuffer.h"
-#include "Tokenizer.h"
-#include "ink_defs.h"
-#include "ink_string.h"
+#include "ts/TextBuffer.h"
+#include "ts/Tokenizer.h"
+#include "ts/ink_defs.h"
+#include "ts/ink_string.h"
#include "P_RecFile.h"
#include "P_RecUtils.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/lib/records/P_RecCore.h
----------------------------------------------------------------------
diff --git a/lib/records/P_RecCore.h b/lib/records/P_RecCore.h
index 6023072..b2f7f63 100644
--- a/lib/records/P_RecCore.h
+++ b/lib/records/P_RecCore.h
@@ -24,11 +24,11 @@
#ifndef _P_REC_CORE_H_
#define _P_REC_CORE_H_
-#include "ink_thread.h"
-#include "ink_hash_table.h"
-#include "ink_llqueue.h"
-#include "ink_rwlock.h"
-#include "TextBuffer.h"
+#include "ts/ink_thread.h"
+#include "ts/ink_hash_table.h"
+#include "ts/ink_llqueue.h"
+#include "ts/ink_rwlock.h"
+#include "ts/TextBuffer.h"
#include "I_RecCore.h"
#include "P_RecDefs.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/lib/records/P_RecUtils.h
----------------------------------------------------------------------
diff --git a/lib/records/P_RecUtils.h b/lib/records/P_RecUtils.h
index c7e7eaa..92d790c 100644
--- a/lib/records/P_RecUtils.h
+++ b/lib/records/P_RecUtils.h
@@ -24,8 +24,8 @@
#ifndef _P_REC_UTILS_H_
#define _P_REC_UTILS_H_
-#include "Diags.h"
-#include "ink_atomic.h"
+#include "ts/Diags.h"
+#include "ts/ink_atomic.h"
#include "P_RecDefs.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/lib/records/RecConfigParse.cc
----------------------------------------------------------------------
diff --git a/lib/records/RecConfigParse.cc b/lib/records/RecConfigParse.cc
index 5798fb2..a801aba 100644
--- a/lib/records/RecConfigParse.cc
+++ b/lib/records/RecConfigParse.cc
@@ -21,18 +21,18 @@
limitations under the License.
*/
-#include "libts.h"
+#include "ts/libts.h"
-#include "TextBuffer.h"
-#include "Tokenizer.h"
-#include "ink_defs.h"
-#include "ink_string.h"
+#include "ts/TextBuffer.h"
+#include "ts/Tokenizer.h"
+#include "ts/ink_defs.h"
+#include "ts/ink_string.h"
#include "P_RecFile.h"
#include "P_RecUtils.h"
#include "P_RecMessage.h"
#include "P_RecCore.h"
-#include "I_Layout.h"
+#include "ts/I_Layout.h"
const char *g_rec_config_fpath = NULL;
LLQ *g_rec_config_contents_llq = NULL;
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/lib/records/RecCore.cc
----------------------------------------------------------------------
diff --git a/lib/records/RecCore.cc b/lib/records/RecCore.cc
index fe4cbc0..34cef55 100644
--- a/lib/records/RecCore.cc
+++ b/lib/records/RecCore.cc
@@ -21,12 +21,12 @@
limitations under the License.
*/
-#include "libts.h"
+#include "ts/libts.h"
#include "P_RecFile.h"
#include "P_RecCore.h"
#include "P_RecUtils.h"
-#include "I_Layout.h"
+#include "ts/I_Layout.h"
static bool g_initialized = false;
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/lib/records/RecFile.cc
----------------------------------------------------------------------
diff --git a/lib/records/RecFile.cc b/lib/records/RecFile.cc
index ba254de..8464923 100644
--- a/lib/records/RecFile.cc
+++ b/lib/records/RecFile.cc
@@ -21,7 +21,7 @@
limitations under the License.
*/
-#include "libts.h"
+#include "ts/libts.h"
#include "P_RecFile.h"
#include "P_RecDefs.h"
#include "P_RecUtils.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/lib/records/RecLocal.cc
----------------------------------------------------------------------
diff --git a/lib/records/RecLocal.cc b/lib/records/RecLocal.cc
index 0338d7a..c9ad6a0 100644
--- a/lib/records/RecLocal.cc
+++ b/lib/records/RecLocal.cc
@@ -21,9 +21,9 @@
limitations under the License.
*/
-#include "libts.h"
+#include "ts/libts.h"
#include "Rollback.h"
-#include "ParseRules.h"
+#include "ts/ParseRules.h"
#include "P_RecCore.h"
#include "P_RecLocal.h"
#include "P_RecMessage.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/lib/records/RecMessage.cc
----------------------------------------------------------------------
diff --git a/lib/records/RecMessage.cc b/lib/records/RecMessage.cc
index 0ca2eef..016d15a 100644
--- a/lib/records/RecMessage.cc
+++ b/lib/records/RecMessage.cc
@@ -21,14 +21,14 @@
limitations under the License.
*/
-#include "libts.h"
+#include "ts/libts.h"
#include "P_RecCore.h"
#include "P_RecFile.h"
#include "P_RecMessage.h"
#include "P_RecUtils.h"
#include "P_RecCore.h"
-#include "I_Layout.h"
+#include "ts/I_Layout.h"
static RecMessageRecvCb g_recv_cb = NULL;
static void *g_recv_cookie = NULL;
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/lib/records/RecMutex.cc
----------------------------------------------------------------------
diff --git a/lib/records/RecMutex.cc b/lib/records/RecMutex.cc
index 63bdc97..35d0190 100644
--- a/lib/records/RecMutex.cc
+++ b/lib/records/RecMutex.cc
@@ -21,7 +21,7 @@
limitations under the License.
*/
-#include "ink_config.h"
+#include "ts/ink_config.h"
#include "I_RecMutex.h"
int
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/lib/records/RecProcess.cc
----------------------------------------------------------------------
diff --git a/lib/records/RecProcess.cc b/lib/records/RecProcess.cc
index f0c59bb..255f9e5 100644
--- a/lib/records/RecProcess.cc
+++ b/lib/records/RecProcess.cc
@@ -21,7 +21,7 @@
limitations under the License.
*/
-#include "libts.h"
+#include "ts/libts.h"
#include "I_Tasks.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/lib/records/RecUtils.cc
----------------------------------------------------------------------
diff --git a/lib/records/RecUtils.cc b/lib/records/RecUtils.cc
index cd9246b..c47b5c8 100644
--- a/lib/records/RecUtils.cc
+++ b/lib/records/RecUtils.cc
@@ -21,7 +21,7 @@
limitations under the License.
*/
-#include "libts.h"
+#include "ts/libts.h"
#include "P_RecUtils.h"
#include "P_RecCore.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/lib/records/test_RecProcess.i
----------------------------------------------------------------------
diff --git a/lib/records/test_RecProcess.i b/lib/records/test_RecProcess.i
index 3d11424..666bae3 100644
--- a/lib/records/test_RecProcess.i
+++ b/lib/records/test_RecProcess.i
@@ -21,7 +21,7 @@
limitations under the License.
*/
-#include "ink_hrtime.h"
+#include "ts/ink_hrtime.h"
#include "P_RecUtils.h"
#include "test_RecordsConfig.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/lib/ts/Arena.cc
----------------------------------------------------------------------
diff --git a/lib/ts/Arena.cc b/lib/ts/Arena.cc
index a67f2fe..bc3aac7 100644
--- a/lib/ts/Arena.cc
+++ b/lib/ts/Arena.cc
@@ -21,8 +21,8 @@
limitations under the License.
*/
-#include "ink_mutex.h"
-#include "libts.h"
+#include "ts/ink_mutex.h"
+#include "ts/libts.h"
#include <assert.h>
#include <string.h>
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/lib/ts/Bitops.cc
----------------------------------------------------------------------
diff --git a/lib/ts/Bitops.cc b/lib/ts/Bitops.cc
index ee0a26f..4a51e3e 100644
--- a/lib/ts/Bitops.cc
+++ b/lib/ts/Bitops.cc
@@ -21,7 +21,7 @@
limitations under the License.
*/
-#include "Bitops.h"
+#include "ts/Bitops.h"
unsigned char bit_table[256] = {
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/lib/ts/CompileParseRules.cc
----------------------------------------------------------------------
diff --git a/lib/ts/CompileParseRules.cc b/lib/ts/CompileParseRules.cc
index 53406fe..1e64a51 100644
--- a/lib/ts/CompileParseRules.cc
+++ b/lib/ts/CompileParseRules.cc
@@ -23,7 +23,7 @@
#define COMPILE_PARSE_RULES
-#include "ParseRules.h"
+#include "ts/ParseRules.h"
const unsigned int parseRulesCType[256] = {0};
const char parseRulesCTypeToUpper[256] = {0};
@@ -36,7 +36,7 @@ char tparseRulesCTypeToLower[256];
#include <stdio.h>
#include <ctype.h>
-#include "ink_string.h"
+#include "ts/ink_string.h"
static char *
uint_to_binary(unsigned int u)
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/lib/ts/ConsistentHash.cc
----------------------------------------------------------------------
diff --git a/lib/ts/ConsistentHash.cc b/lib/ts/ConsistentHash.cc
index c983ccb..461c39f 100644
--- a/lib/ts/ConsistentHash.cc
+++ b/lib/ts/ConsistentHash.cc
@@ -19,7 +19,7 @@
limitations under the License.
*/
-#include "ConsistentHash.h"
+#include "ts/ConsistentHash.h"
#include <cstring>
#include <string>
#include <sstream>
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/lib/ts/Diags.cc
----------------------------------------------------------------------
diff --git a/lib/ts/Diags.cc b/lib/ts/Diags.cc
index 97c4911..da8b9a9 100644
--- a/lib/ts/Diags.cc
+++ b/lib/ts/Diags.cc
@@ -34,14 +34,14 @@
****************************************************************************/
-#include "ink_platform.h"
-#include "ink_memory.h"
-#include "ink_defs.h"
-#include "ink_error.h"
-#include "ink_assert.h"
-#include "ink_time.h"
-#include "ink_hrtime.h"
-#include "Diags.h"
+#include "ts/ink_platform.h"
+#include "ts/ink_memory.h"
+#include "ts/ink_defs.h"
+#include "ts/ink_error.h"
+#include "ts/ink_assert.h"
+#include "ts/ink_time.h"
+#include "ts/ink_hrtime.h"
+#include "ts/Diags.h"
int diags_on_for_plugins = 0;
bool DiagsConfigState::enabled[2] = {false, false};
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/lib/ts/EventNotify.cc
----------------------------------------------------------------------
diff --git a/lib/ts/EventNotify.cc b/lib/ts/EventNotify.cc
index dce9d81..28b509c 100644
--- a/lib/ts/EventNotify.cc
+++ b/lib/ts/EventNotify.cc
@@ -27,9 +27,9 @@
Generic event notify mechanism among threads.
**************************************************************************/
-#include "EventNotify.h"
-#include "ink_hrtime.h"
-#include "ink_defs.h"
+#include "ts/EventNotify.h"
+#include "ts/ink_hrtime.h"
+#include "ts/ink_defs.h"
#ifdef HAVE_EVENTFD
#include <sys/eventfd.h>
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/lib/ts/Hash.cc
----------------------------------------------------------------------
diff --git a/lib/ts/Hash.cc b/lib/ts/Hash.cc
index 31a74b7..e8debb4 100644
--- a/lib/ts/Hash.cc
+++ b/lib/ts/Hash.cc
@@ -19,7 +19,7 @@
limitations under the License.
*/
-#include "Hash.h"
+#include "ts/Hash.h"
#include <cstring>
ATSHashBase::~ATSHashBase()
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/lib/ts/HashFNV.cc
----------------------------------------------------------------------
diff --git a/lib/ts/HashFNV.cc b/lib/ts/HashFNV.cc
index c4897bb..6fca238 100644
--- a/lib/ts/HashFNV.cc
+++ b/lib/ts/HashFNV.cc
@@ -7,7 +7,7 @@
Currently implemented FNV-1a 32bit and FNV-1a 64bit
*/
-#include "HashFNV.h"
+#include "ts/HashFNV.h"
static const uint32_t FNV_INIT_32 = 0x811c9dc5u;
static const uint64_t FNV_INIT_64 = 0xcbf29ce484222325ull;
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/lib/ts/HashMD5.cc
----------------------------------------------------------------------
diff --git a/lib/ts/HashMD5.cc b/lib/ts/HashMD5.cc
index 93fb787..c771c13 100644
--- a/lib/ts/HashMD5.cc
+++ b/lib/ts/HashMD5.cc
@@ -19,7 +19,7 @@
limitations under the License.
*/
-#include "HashMD5.h"
+#include "ts/HashMD5.h"
ATSHashMD5::ATSHashMD5(void)
{
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/lib/ts/HashSip.cc
----------------------------------------------------------------------
diff --git a/lib/ts/HashSip.cc b/lib/ts/HashSip.cc
index 80a2c00..22899d6 100644
--- a/lib/ts/HashSip.cc
+++ b/lib/ts/HashSip.cc
@@ -8,7 +8,7 @@ https://github.com/floodyberry/siphash
*/
-#include "HashSip.h"
+#include "ts/HashSip.h"
#include <cstring>
#define SIP_BLOCK_SIZE 8
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/lib/ts/HostLookup.cc
----------------------------------------------------------------------
diff --git a/lib/ts/HostLookup.cc b/lib/ts/HostLookup.cc
index c0d88e0..2b6bdaf 100644
--- a/lib/ts/HostLookup.cc
+++ b/lib/ts/HostLookup.cc
@@ -27,9 +27,9 @@
*
*
****************************************************************************/
-#include "libts.h"
-#include "HostLookup.h"
-#include "MatcherUtils.h"
+#include "ts/libts.h"
+#include "ts/HostLookup.h"
+#include "ts/MatcherUtils.h"
// bool domaincmp(const char* hostname, const char* domain)
//
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/lib/ts/IpMap.cc
----------------------------------------------------------------------
diff --git a/lib/ts/IpMap.cc b/lib/ts/IpMap.cc
index 67cba39..dee651f 100644
--- a/lib/ts/IpMap.cc
+++ b/lib/ts/IpMap.cc
@@ -1,4 +1,4 @@
-#include "IpMap.h"
+#include "ts/IpMap.h"
/** @file
IP address map support.
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/lib/ts/Layout.cc
----------------------------------------------------------------------
diff --git a/lib/ts/Layout.cc b/lib/ts/Layout.cc
index 8669953..730b399 100644
--- a/lib/ts/Layout.cc
+++ b/lib/ts/Layout.cc
@@ -21,8 +21,8 @@
limitations under the License.
*/
-#include "libts.h"
-#include "I_Layout.h"
+#include "ts/libts.h"
+#include "ts/I_Layout.h"
static Layout *layout = NULL;
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/lib/ts/MMH.cc
----------------------------------------------------------------------
diff --git a/lib/ts/MMH.cc b/lib/ts/MMH.cc
index 4154aee..007928e 100644
--- a/lib/ts/MMH.cc
+++ b/lib/ts/MMH.cc
@@ -23,9 +23,9 @@
#include <stdlib.h>
#include <string.h>
-#include "ink_assert.h"
-#include "ink_platform.h"
-#include "MMH.h"
+#include "ts/ink_assert.h"
+#include "ts/ink_platform.h"
+#include "ts/MMH.h"
#define MMH_X_SIZE 512
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/lib/ts/MatcherUtils.cc
----------------------------------------------------------------------
diff --git a/lib/ts/MatcherUtils.cc b/lib/ts/MatcherUtils.cc
index 1449b4f..8e8935b 100644
--- a/lib/ts/MatcherUtils.cc
+++ b/lib/ts/MatcherUtils.cc
@@ -29,7 +29,7 @@
*
****************************************************************************/
-#include "libts.h" /* MAGIC_EDITING_TAG */
+#include "ts/libts.h" /* MAGIC_EDITING_TAG */
config_parse_error::config_parse_error(const char *fmt, ...)
{
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/lib/ts/MatcherUtils.h
----------------------------------------------------------------------
diff --git a/lib/ts/MatcherUtils.h b/lib/ts/MatcherUtils.h
index d9ad8d4..89342c3 100644
--- a/lib/ts/MatcherUtils.h
+++ b/lib/ts/MatcherUtils.h
@@ -32,7 +32,7 @@
#ifndef _MATCHER_UTILS_H_
#define _MATCHER_UTILS_H_
-#include "ParseRules.h"
+#include "ts/ParseRules.h"
// Look in MatcherUtils.cc for comments on function usage
char *readIntoBuffer(const char *file_path, const char *module_name, int *read_size_ptr);
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/lib/ts/MimeTable.cc
----------------------------------------------------------------------
diff --git a/lib/ts/MimeTable.cc b/lib/ts/MimeTable.cc
index 83cc337..6e4e8cf 100644
--- a/lib/ts/MimeTable.cc
+++ b/lib/ts/MimeTable.cc
@@ -21,7 +21,7 @@
limitations under the License.
*/
-#include "libts.h" /* MAGIC_EDITING_TAG */
+#include "ts/libts.h" /* MAGIC_EDITING_TAG */
MimeTableEntry MimeTable::m_table[] = {{"ai", "application/postscript", "8bit", "text"},
{"aif", "audio/x-aiff", "binary", "sound"},
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/lib/ts/ParseRules.cc
----------------------------------------------------------------------
diff --git a/lib/ts/ParseRules.cc b/lib/ts/ParseRules.cc
index 5864e70..12a221a 100644
--- a/lib/ts/ParseRules.cc
+++ b/lib/ts/ParseRules.cc
@@ -28,7 +28,7 @@
****************************************************************************/
-#include "libts.h" /* MAGIC_EDITING_TAG */
+#include "ts/libts.h" /* MAGIC_EDITING_TAG */
const unsigned int parseRulesCType[256] = {
#include "ParseRulesCType"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/lib/ts/RawHashTable.cc
----------------------------------------------------------------------
diff --git a/lib/ts/RawHashTable.cc b/lib/ts/RawHashTable.cc
index 192a4fa..c4ea99e 100644
--- a/lib/ts/RawHashTable.cc
+++ b/lib/ts/RawHashTable.cc
@@ -28,4 +28,4 @@
*/
-#include "RawHashTable.h"
+#include "ts/RawHashTable.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/lib/ts/RbTree.cc
----------------------------------------------------------------------
diff --git a/lib/ts/RbTree.cc b/lib/ts/RbTree.cc
index 64b80fa..124cea6 100644
--- a/lib/ts/RbTree.cc
+++ b/lib/ts/RbTree.cc
@@ -19,7 +19,7 @@
limitations under the License.
*/
-#include "RbTree.h"
+#include "ts/RbTree.h"
namespace ts
{
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/lib/ts/Regex.cc
----------------------------------------------------------------------
diff --git a/lib/ts/Regex.cc b/lib/ts/Regex.cc
index 916ca68..dcaae99 100644
--- a/lib/ts/Regex.cc
+++ b/lib/ts/Regex.cc
@@ -21,8 +21,8 @@
limitations under the License.
*/
-#include "libts.h"
-#include "Regex.h"
+#include "ts/libts.h"
+#include "ts/Regex.h"
#ifdef PCRE_CONFIG_JIT
struct RegexThreadKey {
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/lib/ts/Regression.cc
----------------------------------------------------------------------
diff --git a/lib/ts/Regression.cc b/lib/ts/Regression.cc
index e64632c..7cd52c5 100644
--- a/lib/ts/Regression.cc
+++ b/lib/ts/Regression.cc
@@ -28,8 +28,8 @@
****************************************************************************/
-#include "libts.h"
-#include "Regression.h"
+#include "ts/libts.h"
+#include "ts/Regression.h"
static RegressionTest *test = NULL;
static RegressionTest *exclusive_test = NULL;
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/lib/ts/Regression.h
----------------------------------------------------------------------
diff --git a/lib/ts/Regression.h b/lib/ts/Regression.h
index ef0f5c7..0a29804 100644
--- a/lib/ts/Regression.h
+++ b/lib/ts/Regression.h
@@ -24,8 +24,8 @@
#ifndef _Regression_h
#define _Regression_h
-#include "libts.h"
-#include "Regex.h"
+#include "ts/libts.h"
+#include "ts/Regex.h"
// Each module should provide one or more regression tests
//
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/lib/ts/TestHttpHeader.cc
----------------------------------------------------------------------
diff --git a/lib/ts/TestHttpHeader.cc b/lib/ts/TestHttpHeader.cc
index 3a03bb9..3fdb0f6 100644
--- a/lib/ts/TestHttpHeader.cc
+++ b/lib/ts/TestHttpHeader.cc
@@ -29,7 +29,7 @@
****************************************************************************/
#include "HttpHeaderTokenizer.h"
-#include "ink_assert.h"
+#include "ts/ink_assert.h"
#include <stdio.h>
#include <stdlib.h>
#include <errno.h>
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/lib/ts/TextBuffer.cc
----------------------------------------------------------------------
diff --git a/lib/ts/TextBuffer.cc b/lib/ts/TextBuffer.cc
index b41fbce..08fe4fe 100644
--- a/lib/ts/TextBuffer.cc
+++ b/lib/ts/TextBuffer.cc
@@ -21,8 +21,8 @@
limitations under the License.
*/
-#include "libts.h"
-#include "TextBuffer.h"
+#include "ts/libts.h"
+#include "ts/TextBuffer.h"
/****************************************************************************
*
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/lib/ts/Tokenizer.cc
----------------------------------------------------------------------
diff --git a/lib/ts/Tokenizer.cc b/lib/ts/Tokenizer.cc
index b2a6f21..4c0e635 100644
--- a/lib/ts/Tokenizer.cc
+++ b/lib/ts/Tokenizer.cc
@@ -22,10 +22,10 @@
*/
/***************************************/
-#include "ink_platform.h"
-#include "Tokenizer.h"
-#include "ink_assert.h"
-#include "ink_memory.h"
+#include "ts/ink_platform.h"
+#include "ts/Tokenizer.h"
+#include "ts/ink_assert.h"
+#include "ts/ink_memory.h"
/****************************************************************************
*
@@ -372,7 +372,7 @@ Tokenizer::ReUse()
}
#if TS_HAS_TESTS
-#include "TestBox.h"
+#include "ts/TestBox.h"
REGRESSION_TEST(libts_Tokenizer)(RegressionTest *test, int /* atype ATS_UNUSED */, int *pstatus)
{
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/lib/ts/Vec.cc
----------------------------------------------------------------------
diff --git a/lib/ts/Vec.cc b/lib/ts/Vec.cc
index 669d413..b11b91e 100644
--- a/lib/ts/Vec.cc
+++ b/lib/ts/Vec.cc
@@ -23,7 +23,7 @@
/* UnionFind after Tarjan */
#include <stdint.h>
-#include "Vec.h"
+#include "ts/Vec.h"
const uintptr_t prime2[] = {1, 3, 7, 13, 31, 61, 127, 251, 509, 1021,
2039, 4093, 8191, 16381, 32749, 65521, 131071, 262139, 524287, 1048573,
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/lib/ts/Vec.h
----------------------------------------------------------------------
diff --git a/lib/ts/Vec.h b/lib/ts/Vec.h
index d44e93a..e1c40be 100644
--- a/lib/ts/Vec.h
+++ b/lib/ts/Vec.h
@@ -28,7 +28,7 @@
#include <stdlib.h>
#include <unistd.h>
#include <sys/types.h>
-#include "defalloc.h"
+#include "ts/defalloc.h"
#include "ts/ink_assert.h"
// Simple Vector class, also supports open hashed sets
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/lib/ts/Version.cc
----------------------------------------------------------------------
diff --git a/lib/ts/Version.cc b/lib/ts/Version.cc
index 30669c0..69121cb 100644
--- a/lib/ts/Version.cc
+++ b/lib/ts/Version.cc
@@ -21,7 +21,7 @@
limitations under the License.
*/
-#include "libts.h"
+#include "ts/libts.h"
AppVersionInfo::AppVersionInfo()
{
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/lib/ts/X509HostnameValidator.cc
----------------------------------------------------------------------
diff --git a/lib/ts/X509HostnameValidator.cc b/lib/ts/X509HostnameValidator.cc
index 9ab01d8..18cf94f 100644
--- a/lib/ts/X509HostnameValidator.cc
+++ b/lib/ts/X509HostnameValidator.cc
@@ -26,7 +26,7 @@
#include <openssl/x509.h>
#include <openssl/x509v3.h>
-#include <ink_memory.h>
+#include "ts/ink_memory.h"
typedef bool (*equal_fn)(const unsigned char *prefix, size_t prefix_len, const unsigned char *suffix, size_t suffix_len);
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/lib/ts/hugepages.cc
----------------------------------------------------------------------
diff --git a/lib/ts/hugepages.cc b/lib/ts/hugepages.cc
index d7d94a4..7763da0 100644
--- a/lib/ts/hugepages.cc
+++ b/lib/ts/hugepages.cc
@@ -21,8 +21,8 @@
#include <cstdio>
#include <sys/mman.h>
-#include "Diags.h"
-#include "ink_align.h"
+#include "ts/Diags.h"
+#include "ts/ink_align.h"
#define DEBUG_TAG "hugepages"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/lib/ts/ink_args.cc
----------------------------------------------------------------------
diff --git a/lib/ts/ink_args.cc b/lib/ts/ink_args.cc
index 91cebd8..983d002 100644
--- a/lib/ts/ink_args.cc
+++ b/lib/ts/ink_args.cc
@@ -26,7 +26,7 @@ Process arguments
****************************************************************************/
-#include "libts.h"
+#include "ts/libts.h"
//
// Global variables
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/lib/ts/ink_assert.cc
----------------------------------------------------------------------
diff --git a/lib/ts/ink_assert.cc b/lib/ts/ink_assert.cc
index b87bae8..0855f48 100644
--- a/lib/ts/ink_assert.cc
+++ b/lib/ts/ink_assert.cc
@@ -26,10 +26,10 @@ Assertions
***************************************************************************/
-#include "ink_platform.h"
-#include "ink_assert.h"
-#include "ink_error.h"
-#include "ink_string.h"
+#include "ts/ink_platform.h"
+#include "ts/ink_assert.h"
+#include "ts/ink_error.h"
+#include "ts/ink_string.h"
void
_ink_assert(const char *expression, const char *file, int line)
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/lib/ts/ink_auth_api.cc
----------------------------------------------------------------------
diff --git a/lib/ts/ink_auth_api.cc b/lib/ts/ink_auth_api.cc
index 401a66c..34aab2d 100644
--- a/lib/ts/ink_auth_api.cc
+++ b/lib/ts/ink_auth_api.cc
@@ -23,9 +23,9 @@
#include <time.h>
#include <stdint.h>
-#include "ink_rand.h"
-#include "ink_code.h"
-#include "ink_auth_api.h"
+#include "ts/ink_rand.h"
+#include "ts/ink_code.h"
+#include "ts/ink_auth_api.h"
static int s_rand_seed = time(NULL); // + s_rand_seed;
static InkRand s_rand_gen(ink_rand_r((unsigned int *) & s_rand_seed) ^ (uintptr_t)&s_rand_seed);
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/lib/ts/ink_base64.cc
----------------------------------------------------------------------
diff --git a/lib/ts/ink_base64.cc b/lib/ts/ink_base64.cc
index 7a67ad1..7fa771f 100644
--- a/lib/ts/ink_base64.cc
+++ b/lib/ts/ink_base64.cc
@@ -31,8 +31,8 @@
* These routines return char*'s to malloc-ed strings. The caller is
* responsible for freeing the strings.
*/
-#include "libts.h"
-#include "ink_assert.h"
+#include "ts/libts.h"
+#include "ts/ink_assert.h"
// TODO: The code here seems a bit klunky, and could probably be improved a bit.
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/lib/ts/ink_cap.cc
----------------------------------------------------------------------
diff --git a/lib/ts/ink_cap.cc b/lib/ts/ink_cap.cc
index 569e3f8..91647f0 100644
--- a/lib/ts/ink_cap.cc
+++ b/lib/ts/ink_cap.cc
@@ -21,10 +21,10 @@
limitations under the License.
*/
-#include "ink_config.h"
-#include "Diags.h"
-#include "ink_cap.h"
-#include "ink_thread.h"
+#include "ts/ink_config.h"
+#include "ts/Diags.h"
+#include "ts/ink_cap.h"
+#include "ts/ink_thread.h"
#include <grp.h>
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/lib/ts/ink_code.cc
----------------------------------------------------------------------
diff --git a/lib/ts/ink_code.cc b/lib/ts/ink_code.cc
index e099b9c..d140df1 100644
--- a/lib/ts/ink_code.cc
+++ b/lib/ts/ink_code.cc
@@ -23,10 +23,10 @@
#include <string.h>
#include <stdio.h>
-#include "ink_code.h"
-#include "INK_MD5.h"
-#include "ink_assert.h"
-#include "INK_MD5.h"
+#include "ts/ink_code.h"
+#include "ts/INK_MD5.h"
+#include "ts/ink_assert.h"
+#include "ts/INK_MD5.h"
ats::CryptoHash const ats::CRYPTO_HASH_ZERO; // default constructed is correct.
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/lib/ts/ink_defs.cc
----------------------------------------------------------------------
diff --git a/lib/ts/ink_defs.cc b/lib/ts/ink_defs.cc
index 3deb389..d913174 100644
--- a/lib/ts/ink_defs.cc
+++ b/lib/ts/ink_defs.cc
@@ -28,8 +28,8 @@
****************************************************************************/
-#include "libts.h"
-#include "ink_platform.h"
+#include "ts/libts.h"
+#include "ts/ink_platform.h"
#if defined(linux) || defined(freebsd) || defined(darwin)
#include <sys/types.h>
#include <sys/param.h>
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/lib/ts/ink_error.cc
----------------------------------------------------------------------
diff --git a/lib/ts/ink_error.cc b/lib/ts/ink_error.cc
index da4f432..481992c 100644
--- a/lib/ts/ink_error.cc
+++ b/lib/ts/ink_error.cc
@@ -22,9 +22,9 @@
*/
-#include "libts.h"
-#include "ink_error.h"
-#include "ink_stack_trace.h"
+#include "ts/libts.h"
+#include "ts/ink_error.h"
+#include "ts/ink_stack_trace.h"
#include <syslog.h>
#include <signal.h> /* MAGIC_EDITING_TAG */
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/lib/ts/ink_file.cc
----------------------------------------------------------------------
diff --git a/lib/ts/ink_file.cc b/lib/ts/ink_file.cc
index b810ba6..e095b14 100644
--- a/lib/ts/ink_file.cc
+++ b/lib/ts/ink_file.cc
@@ -21,7 +21,7 @@
limitations under the License.
*/
-#include "libts.h"
+#include "ts/libts.h"
#include <unistd.h>
#include <limits.h>
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/lib/ts/ink_hash_table.cc
----------------------------------------------------------------------
diff --git a/lib/ts/ink_hash_table.cc b/lib/ts/ink_hash_table.cc
index 3ba691b..b197d8b 100644
--- a/lib/ts/ink_hash_table.cc
+++ b/lib/ts/ink_hash_table.cc
@@ -30,9 +30,9 @@
****************************************************************************/
-#include "ink_error.h"
-#include "ink_hash_table.h"
-#include "ink_memory.h"
+#include "ts/ink_error.h"
+#include "ts/ink_hash_table.h"
+#include "ts/ink_memory.h"
/*===========================================================================*
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/lib/ts/ink_hrtime.cc
----------------------------------------------------------------------
diff --git a/lib/ts/ink_hrtime.cc b/lib/ts/ink_hrtime.cc
index 1da8d24..7432d10 100644
--- a/lib/ts/ink_hrtime.cc
+++ b/lib/ts/ink_hrtime.cc
@@ -28,9 +28,9 @@
This file contains code supporting the Inktomi high-resolution timer.
**************************************************************************/
-#include "ink_hrtime.h"
-#include "ink_assert.h"
-#include "ink_defs.h"
+#include "ts/ink_hrtime.h"
+#include "ts/ink_assert.h"
+#include "ts/ink_defs.h"
#if defined(freebsd)
#include <sys/types.h>
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/lib/ts/ink_inet.cc
----------------------------------------------------------------------
diff --git a/lib/ts/ink_inet.cc b/lib/ts/ink_inet.cc
index 1812f75..a880a41 100644
--- a/lib/ts/ink_inet.cc
+++ b/lib/ts/ink_inet.cc
@@ -21,7 +21,7 @@
limitations under the License.
*/
-#include "libts.h"
+#include "ts/libts.h"
#include "ts/TestBox.h"
#if defined(darwin)
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/lib/ts/ink_memory.cc
----------------------------------------------------------------------
diff --git a/lib/ts/ink_memory.cc b/lib/ts/ink_memory.cc
index 4c18c43..ffbc9ae 100644
--- a/lib/ts/ink_memory.cc
+++ b/lib/ts/ink_memory.cc
@@ -20,7 +20,7 @@
See the License for the specific language governing permissions and
limitations under the License.
*/
-#include "libts.h"
+#include "ts/libts.h"
#include <assert.h>
#if defined(linux)
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/lib/ts/ink_mutex.cc
----------------------------------------------------------------------
diff --git a/lib/ts/ink_mutex.cc b/lib/ts/ink_mutex.cc
index 98cc70a..36a68bd 100644
--- a/lib/ts/ink_mutex.cc
+++ b/lib/ts/ink_mutex.cc
@@ -21,10 +21,10 @@
limitations under the License.
*/
-#include "ink_error.h"
-#include "ink_defs.h"
+#include "ts/ink_error.h"
+#include "ts/ink_defs.h"
#include <assert.h>
#include "stdio.h"
-#include "ink_mutex.h"
+#include "ts/ink_mutex.h"
ink_mutex __global_death = PTHREAD_MUTEX_INITIALIZER;
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/lib/ts/ink_queue.cc
----------------------------------------------------------------------
diff --git a/lib/ts/ink_queue.cc b/lib/ts/ink_queue.cc
index 38eaae6..8fa2902 100644
--- a/lib/ts/ink_queue.cc
+++ b/lib/ts/ink_queue.cc
@@ -36,20 +36,20 @@
****************************************************************************/
-#include "ink_config.h"
+#include "ts/ink_config.h"
#include <assert.h>
#include <memory.h>
#include <stdlib.h>
#include <unistd.h>
#include <sys/types.h>
#include <sys/mman.h>
-#include "ink_atomic.h"
-#include "ink_queue.h"
-#include "ink_memory.h"
-#include "ink_error.h"
-#include "ink_assert.h"
-#include "ink_align.h"
-#include "hugepages.h"
+#include "ts/ink_atomic.h"
+#include "ts/ink_queue.h"
+#include "ts/ink_memory.h"
+#include "ts/ink_error.h"
+#include "ts/ink_assert.h"
+#include "ts/ink_align.h"
+#include "ts/hugepages.h"
inkcoreapi volatile int64_t fastalloc_mem_in_use = 0;
inkcoreapi volatile int64_t fastalloc_mem_total = 0;
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/lib/ts/ink_queue_utils.cc
----------------------------------------------------------------------
diff --git a/lib/ts/ink_queue_utils.cc b/lib/ts/ink_queue_utils.cc
index 25b5b6e..332fe4f 100644
--- a/lib/ts/ink_queue_utils.cc
+++ b/lib/ts/ink_queue_utils.cc
@@ -21,11 +21,11 @@
limitations under the License.
*/
-#include "ink_config.h"
+#include "ts/ink_config.h"
#include <assert.h>
-#include "ink_atomic.h"
-#include "ink_queue.h"
+#include "ts/ink_atomic.h"
+#include "ts/ink_queue.h"
/*
* This file was added during the debugging of Bug 50475.
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/lib/ts/ink_rand.cc
----------------------------------------------------------------------
diff --git a/lib/ts/ink_rand.cc b/lib/ts/ink_rand.cc
index b4c780f..5251790 100644
--- a/lib/ts/ink_rand.cc
+++ b/lib/ts/ink_rand.cc
@@ -55,7 +55,7 @@
*/
-#include "libts.h"
+#include "ts/libts.h"
#define NN 312
#define MM 156
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/lib/ts/ink_res_init.cc
----------------------------------------------------------------------
diff --git a/lib/ts/ink_res_init.cc b/lib/ts/ink_res_init.cc
index 8dbe091..b86b3cf 100644
--- a/lib/ts/ink_res_init.cc
+++ b/lib/ts/ink_res_init.cc
@@ -65,8 +65,8 @@
*/
-#include "ink_platform.h"
-#include "ink_defs.h"
+#include "ts/ink_platform.h"
+#include "ts/ink_defs.h"
#include <sys/types.h>
#include <sys/param.h>
@@ -85,10 +85,10 @@
#include <stdlib.h>
#include <string.h>
-#include "ink_string.h"
-#include "ink_resolver.h"
-#include "ink_inet.h"
-#include "Tokenizer.h"
+#include "ts/ink_string.h"
+#include "ts/ink_resolver.h"
+#include "ts/ink_inet.h"
+#include "ts/Tokenizer.h"
#if !defined(isascii) /* XXX - could be a function */
#define isascii(c) (!(c & 0200))
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/lib/ts/ink_res_mkquery.cc
----------------------------------------------------------------------
diff --git a/lib/ts/ink_res_mkquery.cc b/lib/ts/ink_res_mkquery.cc
index 1101628..3d37ad1 100644
--- a/lib/ts/ink_res_mkquery.cc
+++ b/lib/ts/ink_res_mkquery.cc
@@ -65,8 +65,8 @@
*/
-#include "ink_config.h"
-#include "ink_defs.h"
+#include "ts/ink_config.h"
+#include "ts/ink_defs.h"
#include <sys/types.h>
#include <sys/param.h>
@@ -80,8 +80,8 @@
#include <stdio.h>
#include <string.h>
-#include "ink_error.h"
-#include "ink_resolver.h"
+#include "ts/ink_error.h"
+#include "ts/ink_resolver.h"
#define SPRINTF(x) (sprintf x)
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/lib/ts/ink_resource.cc
----------------------------------------------------------------------
diff --git a/lib/ts/ink_resource.cc b/lib/ts/ink_resource.cc
index cbb4b58..c887c6e 100644
--- a/lib/ts/ink_resource.cc
+++ b/lib/ts/ink_resource.cc
@@ -21,9 +21,9 @@
limitations under the License.
*/
-#include "ink_assert.h"
-#include "ink_atomic.h"
-#include "ink_resource.h"
+#include "ts/ink_assert.h"
+#include "ts/ink_atomic.h"
+#include "ts/ink_resource.h"
volatile int res_track_memory = 0; // Disabled by default
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/lib/ts/ink_rwlock.cc
----------------------------------------------------------------------
diff --git a/lib/ts/ink_rwlock.cc b/lib/ts/ink_rwlock.cc
index a28f8ee..a2eb785 100644
--- a/lib/ts/ink_rwlock.cc
+++ b/lib/ts/ink_rwlock.cc
@@ -21,8 +21,8 @@
limitations under the License.
*/
-#include "ink_config.h"
-#include "ink_rwlock.h"
+#include "ts/ink_config.h"
+#include "ts/ink_rwlock.h"
//-------------------------------------------------------------------------
// ink_rwlock_init
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/lib/ts/ink_sock.cc
----------------------------------------------------------------------
diff --git a/lib/ts/ink_sock.cc b/lib/ts/ink_sock.cc
index 3c72103..94c3f8a 100644
--- a/lib/ts/ink_sock.cc
+++ b/lib/ts/ink_sock.cc
@@ -27,7 +27,7 @@
***************************************************************************/
-#include "libts.h"
+#include "ts/libts.h"
//
// Compilation options
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/lib/ts/ink_sprintf.cc
----------------------------------------------------------------------
diff --git a/lib/ts/ink_sprintf.cc b/lib/ts/ink_sprintf.cc
index 26a0716..9d58f9d 100644
--- a/lib/ts/ink_sprintf.cc
+++ b/lib/ts/ink_sprintf.cc
@@ -31,7 +31,7 @@
****************************************************************************/
-#include "ink_sprintf.h"
+#include "ts/ink_sprintf.h"
#define NUL '\0'
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/lib/ts/ink_stack_trace.cc
----------------------------------------------------------------------
diff --git a/lib/ts/ink_stack_trace.cc b/lib/ts/ink_stack_trace.cc
index b38b8e1..1375eaf 100644
--- a/lib/ts/ink_stack_trace.cc
+++ b/lib/ts/ink_stack_trace.cc
@@ -21,8 +21,8 @@
limitations under the License.
*/
-#include "libts.h"
-#include "ink_stack_trace.h"
+#include "ts/libts.h"
+#include "ts/ink_stack_trace.h"
#include <strings.h>
#include <stdio.h>
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/lib/ts/ink_string++.cc
----------------------------------------------------------------------
diff --git a/lib/ts/ink_string++.cc b/lib/ts/ink_string++.cc
index dacc870..77d51f4 100644
--- a/lib/ts/ink_string++.cc
+++ b/lib/ts/ink_string++.cc
@@ -30,7 +30,7 @@
****************************************************************************/
-#include "libts.h"
+#include "ts/libts.h"
/***********************************************************************
* *
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/lib/ts/ink_string.cc
----------------------------------------------------------------------
diff --git a/lib/ts/ink_string.cc b/lib/ts/ink_string.cc
index f8178e1..5d56c7b 100644
--- a/lib/ts/ink_string.cc
+++ b/lib/ts/ink_string.cc
@@ -21,7 +21,7 @@
limitations under the License.
*/
-#include "libts.h" /* MAGIC_EDITING_TAG */
+#include "ts/libts.h" /* MAGIC_EDITING_TAG */
#include <assert.h>
#include <stdarg.h>
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/lib/ts/ink_sys_control.cc
----------------------------------------------------------------------
diff --git a/lib/ts/ink_sys_control.cc b/lib/ts/ink_sys_control.cc
index 626b496..0e43228 100644
--- a/lib/ts/ink_sys_control.cc
+++ b/lib/ts/ink_sys_control.cc
@@ -21,9 +21,9 @@
limitations under the License.
*/
-#include "ink_defs.h"
-#include "ink_assert.h"
-#include "ink_sys_control.h"
+#include "ts/ink_defs.h"
+#include "ts/ink_assert.h"
+#include "ts/ink_sys_control.h"
rlim_t
ink_max_out_rlimit(int which, bool max_it, bool unlim_it)
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/lib/ts/ink_syslog.cc
----------------------------------------------------------------------
diff --git a/lib/ts/ink_syslog.cc b/lib/ts/ink_syslog.cc
index 65f8d04..ad8b00c 100644
--- a/lib/ts/ink_syslog.cc
+++ b/lib/ts/ink_syslog.cc
@@ -28,7 +28,7 @@
*
*
****************************************************************************/
-#include "libts.h"
+#include "ts/libts.h"
struct syslog_fac {
char *long_str;
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/lib/ts/ink_thread.cc
----------------------------------------------------------------------
diff --git a/lib/ts/ink_thread.cc b/lib/ts/ink_thread.cc
index ef38815..d84812e 100644
--- a/lib/ts/ink_thread.cc
+++ b/lib/ts/ink_thread.cc
@@ -28,7 +28,7 @@
Generic threads interface.
**************************************************************************/
-#include "libts.h"
+#include "ts/libts.h"
// // ignore the compiler warning... so that this can be used
// // in the face of changes to the Solaris header files (see "man thread")
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/lib/ts/ink_time.cc
----------------------------------------------------------------------
diff --git a/lib/ts/ink_time.cc b/lib/ts/ink_time.cc
index 38f47fe..11cd891 100644
--- a/lib/ts/ink_time.cc
+++ b/lib/ts/ink_time.cc
@@ -28,11 +28,11 @@
****************************************************************************/
-#include "ink_platform.h"
-#include "ink_defs.h"
-#include "ink_time.h"
-#include "ink_assert.h"
-#include "ink_string.h"
+#include "ts/ink_platform.h"
+#include "ts/ink_defs.h"
+#include "ts/ink_time.h"
+#include "ts/ink_assert.h"
+#include "ts/ink_string.h"
#include <locale.h>
#include <sys/resource.h>
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/lib/ts/libts.h
----------------------------------------------------------------------
diff --git a/lib/ts/libts.h b/lib/ts/libts.h
index 40c6835..8c2edf1 100644
--- a/lib/ts/libts.h
+++ b/lib/ts/libts.h
@@ -41,7 +41,7 @@
#define std *** _FIXME_REMOVE_DEPENDENCY_ON_THE_STL_ ***
*/
-#include "hugepages.h"
+#include "ts/hugepages.h"
#include "ts/ink_config.h"
#include "ts/ink_platform.h"
#include "ts/ink_align.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/lib/ts/llqueue.cc
----------------------------------------------------------------------
diff --git a/lib/ts/llqueue.cc b/lib/ts/llqueue.cc
index 414ecb6..04cb182 100644
--- a/lib/ts/llqueue.cc
+++ b/lib/ts/llqueue.cc
@@ -21,15 +21,15 @@
limitations under the License.
*/
-#include "ink_config.h"
-#include "ink_memory.h"
+#include "ts/ink_config.h"
+#include "ts/ink_memory.h"
#include <stdio.h>
#include <stdlib.h>
#include <assert.h>
#include <limits.h>
-#include "ink_llqueue.h"
+#include "ts/ink_llqueue.h"
#include "errno.h"
#define RECORD_CHUNK 1024
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/lib/ts/load_http_hdr.cc
----------------------------------------------------------------------
diff --git a/lib/ts/load_http_hdr.cc b/lib/ts/load_http_hdr.cc
index 66de373..284b3f4 100644
--- a/lib/ts/load_http_hdr.cc
+++ b/lib/ts/load_http_hdr.cc
@@ -35,7 +35,7 @@
#include "Marshal.h"
#include "MIME.h"
#include "HTTP.h"
-#include "Tokenizer.h"
+#include "ts/Tokenizer.h"
#include <stdio.h>
#include <errno.h>
#include <sys/types.h>
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/lib/ts/lockfile.cc
----------------------------------------------------------------------
diff --git a/lib/ts/lockfile.cc b/lib/ts/lockfile.cc
index 7ca9b83..624f158 100644
--- a/lib/ts/lockfile.cc
+++ b/lib/ts/lockfile.cc
@@ -21,8 +21,8 @@
limitations under the License.
*/
-#include "ink_platform.h"
-#include "ink_lockfile.h"
+#include "ts/ink_platform.h"
+#include "ts/ink_lockfile.h"
#define LOCKFILE_BUF_LEN 16 // 16 bytes should be enought for a pid
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/lib/ts/signals.cc
----------------------------------------------------------------------
diff --git a/lib/ts/signals.cc b/lib/ts/signals.cc
index 0c415fd..6397b96 100644
--- a/lib/ts/signals.cc
+++ b/lib/ts/signals.cc
@@ -26,9 +26,9 @@
**************************************************************************/
-#include "libts.h"
-#include "signals.h"
-#include "ink_stack_trace.h"
+#include "ts/libts.h"
+#include "ts/signals.h"
+#include "ts/ink_stack_trace.h"
bool
signal_check_handler(int signal, signal_handler_t handler)
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/lib/ts/test_Map.cc
----------------------------------------------------------------------
diff --git a/lib/ts/test_Map.cc b/lib/ts/test_Map.cc
index bb0c12c..64f5f2a 100644
--- a/lib/ts/test_Map.cc
+++ b/lib/ts/test_Map.cc
@@ -21,7 +21,7 @@
limitations under the License.
*/
#include <stdint.h>
-#include "Map.h"
+#include "ts/Map.h"
typedef const char cchar;
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/lib/ts/test_Vec.cc
----------------------------------------------------------------------
diff --git a/lib/ts/test_Vec.cc b/lib/ts/test_Vec.cc
index 2eb7cc6..9f5a838 100644
--- a/lib/ts/test_Vec.cc
+++ b/lib/ts/test_Vec.cc
@@ -24,8 +24,8 @@
#include <stdint.h>
#include <stdio.h>
-#include <ink_assert.h>
-#include "Vec.h"
+#include "ts/ink_assert.h"
+#include "ts/Vec.h"
static void
test_append()
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/lib/ts/test_arena.cc
----------------------------------------------------------------------
diff --git a/lib/ts/test_arena.cc b/lib/ts/test_arena.cc
index 515a8bf..9f93522 100644
--- a/lib/ts/test_arena.cc
+++ b/lib/ts/test_arena.cc
@@ -33,7 +33,7 @@
****************************************************************************/
-#include "Arena.h"
+#include "ts/Arena.h"
#include <stdio.h>
void
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/lib/ts/test_freelist.cc
----------------------------------------------------------------------
diff --git a/lib/ts/test_freelist.cc b/lib/ts/test_freelist.cc
index 9d8e5b4..c7b3e3f 100644
--- a/lib/ts/test_freelist.cc
+++ b/lib/ts/test_freelist.cc
@@ -23,8 +23,8 @@
#include <stdlib.h>
#include <string.h>
-#include "ink_thread.h"
-#include "ink_queue.h"
+#include "ts/ink_thread.h"
+#include "ts/ink_queue.h"
#define NTHREADS 64
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/lib/tsconfig/Makefile.am
----------------------------------------------------------------------
diff --git a/lib/tsconfig/Makefile.am b/lib/tsconfig/Makefile.am
index 19e1acd..932604f 100644
--- a/lib/tsconfig/Makefile.am
+++ b/lib/tsconfig/Makefile.am
@@ -24,9 +24,7 @@ AM_CFLAGS += @FLEX_CFLAGS@
AM_YFLAGS = --yacc -d -p tsconfig
AM_CPPFLAGS = \
- -I$(top_srcdir)/lib \
- -I$(top_srcdir)/lib/ts \
- -I$(top_builddir)/lib/ts
+ -I$(top_srcdir)/lib
BUILT_SOURCES = \
TsConfigGrammar.hpp
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/lib/wccp/Makefile.am
----------------------------------------------------------------------
diff --git a/lib/wccp/Makefile.am b/lib/wccp/Makefile.am
index abbf632..fdb12e4 100644
--- a/lib/wccp/Makefile.am
+++ b/lib/wccp/Makefile.am
@@ -19,7 +19,6 @@
AM_CPPFLAGS = \
-I$(top_srcdir)/lib \
- -I$(top_srcdir)/lib/ts \
-I$(top_srcdir)/proxy/api/ts
#WCCP_DEFS = @WCCP_DEFS@
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/lib/wccp/Wccp.h
----------------------------------------------------------------------
diff --git a/lib/wccp/Wccp.h b/lib/wccp/Wccp.h
index 8dd92d7..5fdf1c2 100644
--- a/lib/wccp/Wccp.h
+++ b/lib/wccp/Wccp.h
@@ -26,8 +26,8 @@
#include <ts/TsBuffer.h>
#include <tsconfig/Errata.h>
#include <memory.h>
-#include <ink_defs.h>
-#include <ink_memory.h>
+#include "ts/ink_defs.h"
+#include "ts/ink_memory.h"
// Nasty, defining this with no prefix. The value is still available
// in TS_VERSION_STRING.
#undef VERSION
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/lib/wccp/WccpEndPoint.cc
----------------------------------------------------------------------
diff --git a/lib/wccp/WccpEndPoint.cc b/lib/wccp/WccpEndPoint.cc
index 41bfe16..2157413 100644
--- a/lib/wccp/WccpEndPoint.cc
+++ b/lib/wccp/WccpEndPoint.cc
@@ -23,8 +23,8 @@
#include "WccpUtil.h"
#include "WccpMeta.h"
#include <errno.h>
-#include "ink_string.h"
-#include "ink_defs.h"
+#include "ts/ink_string.h"
+#include "ts/ink_defs.h"
// ------------------------------------------------------
namespace wccp
{
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/lib/wccp/WccpMsg.cc
----------------------------------------------------------------------
diff --git a/lib/wccp/WccpMsg.cc b/lib/wccp/WccpMsg.cc
index c4ed4f9..dfc404b 100644
--- a/lib/wccp/WccpMsg.cc
+++ b/lib/wccp/WccpMsg.cc
@@ -24,8 +24,8 @@
#include <errno.h>
#include <openssl/md5.h>
#include <TsException.h>
-#include "ink_memory.h"
-#include "ink_string.h"
+#include "ts/ink_memory.h"
+#include "ts/ink_string.h"
namespace wccp
{
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/lib/wccp/WccpStatic.cc
----------------------------------------------------------------------
diff --git a/lib/wccp/WccpStatic.cc b/lib/wccp/WccpStatic.cc
index d0fd91e..36c4405 100644
--- a/lib/wccp/WccpStatic.cc
+++ b/lib/wccp/WccpStatic.cc
@@ -22,8 +22,8 @@
#include "WccpLocal.h"
#include "WccpMeta.h"
-#include "ink_error.h"
-#include "ink_defs.h"
+#include "ts/ink_error.h"
+#include "ts/ink_defs.h"
/* Solaris considers SIOCGIFCONF obsolete and only defines it if
* BSD compatibility activated. */
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/mgmt/Alarms.cc
----------------------------------------------------------------------
diff --git a/mgmt/Alarms.cc b/mgmt/Alarms.cc
index 2b260b9..fe2c4af 100644
--- a/mgmt/Alarms.cc
+++ b/mgmt/Alarms.cc
@@ -22,12 +22,12 @@
*/
-#include "libts.h"
+#include "ts/libts.h"
#include "LocalManager.h"
#include "ClusterCom.h"
#include "MgmtUtils.h"
#include "Alarms.h"
-#include "Diags.h"
+#include "ts/Diags.h"
#include "P_RecCore.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/mgmt/Alarms.h
----------------------------------------------------------------------
diff --git a/mgmt/Alarms.h b/mgmt/Alarms.h
index b699d4c..0ec9854 100644
--- a/mgmt/Alarms.h
+++ b/mgmt/Alarms.h
@@ -38,8 +38,8 @@
#include <stdlib.h>
#include <stdio.h>
-#include "ink_hash_table.h"
-#include "ink_mutex.h"
+#include "ts/ink_hash_table.h"
+#include "ts/ink_mutex.h"
class AppVersionInfo;
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/mgmt/BaseManager.cc
----------------------------------------------------------------------
diff --git a/mgmt/BaseManager.cc b/mgmt/BaseManager.cc
index c72c4a9..3e93deb 100644
--- a/mgmt/BaseManager.cc
+++ b/mgmt/BaseManager.cc
@@ -31,7 +31,7 @@
*
*/
-#include "libts.h"
+#include "ts/libts.h"
#include "BaseManager.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/mgmt/BaseManager.h
----------------------------------------------------------------------
diff --git a/mgmt/BaseManager.h b/mgmt/BaseManager.h
index 2075d54..dbaca14 100644
--- a/mgmt/BaseManager.h
+++ b/mgmt/BaseManager.h
@@ -34,9 +34,9 @@
#ifndef _BASE_MANAGER_H
#define _BASE_MANAGER_H
-#include "ink_thread.h"
-#include "ink_mutex.h"
-#include "ink_llqueue.h"
+#include "ts/ink_thread.h"
+#include "ts/ink_mutex.h"
+#include "ts/ink_llqueue.h"
#include "MgmtDefs.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/mgmt/FileManager.cc
----------------------------------------------------------------------
diff --git a/mgmt/FileManager.cc b/mgmt/FileManager.cc
index 55e1dd8..963687e 100644
--- a/mgmt/FileManager.cc
+++ b/mgmt/FileManager.cc
@@ -21,8 +21,8 @@
limitations under the License.
*/
-#include "libts.h"
-#include "I_Layout.h"
+#include "ts/libts.h"
+#include "ts/I_Layout.h"
#include "FileManager.h"
#include "Main.h"
#include "Rollback.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/mgmt/FileManager.h
----------------------------------------------------------------------
diff --git a/mgmt/FileManager.h b/mgmt/FileManager.h
index 8fd31bd..6f9a262 100644
--- a/mgmt/FileManager.h
+++ b/mgmt/FileManager.h
@@ -33,8 +33,8 @@
#include <stdio.h>
-#include "ink_hash_table.h"
-#include "List.h"
+#include "ts/ink_hash_table.h"
+#include "ts/List.h"
#include "Rollback.h"
#include "MultiFile.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/mgmt/LocalManager.cc
----------------------------------------------------------------------
diff --git a/mgmt/LocalManager.cc b/mgmt/LocalManager.cc
index 4d8fddf..67978ff 100644
--- a/mgmt/LocalManager.cc
+++ b/mgmt/LocalManager.cc
@@ -22,13 +22,13 @@
*/
-#include "libts.h"
-#include "ink_platform.h"
+#include "ts/libts.h"
+#include "ts/ink_platform.h"
#include "MgmtUtils.h"
-#include "I_Layout.h"
+#include "ts/I_Layout.h"
#include "LocalManager.h"
#include "MgmtSocket.h"
-#include "ink_cap.h"
+#include "ts/ink_cap.h"
#include "FileManager.h"
#include "ClusterCom.h"
#include "VMap.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/mgmt/Makefile.am
----------------------------------------------------------------------
diff --git a/mgmt/Makefile.am b/mgmt/Makefile.am
index cc0cb82..0cfabdf 100644
--- a/mgmt/Makefile.am
+++ b/mgmt/Makefile.am
@@ -34,8 +34,6 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/proxy \
-I$(top_srcdir)/proxy/hdrs \
-I$(top_srcdir)/lib/records \
- -I$(top_srcdir)/lib/ts \
- -I$(top_builddir)/lib/ts \
-I$(top_srcdir)/lib
libmgmt_c_la_SOURCES = \
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/mgmt/MgmtDefs.h
----------------------------------------------------------------------
diff --git a/mgmt/MgmtDefs.h b/mgmt/MgmtDefs.h
index 1d0ad67..c4cd86a 100644
--- a/mgmt/MgmtDefs.h
+++ b/mgmt/MgmtDefs.h
@@ -37,8 +37,8 @@
/*
* Type definitions.
*/
-#include "ink_defs.h"
-#include "ink_hrtime.h"
+#include "ts/ink_defs.h"
+#include "ts/ink_hrtime.h"
typedef int64_t MgmtIntCounter;
typedef int64_t MgmtInt;
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/mgmt/MultiFile.cc
----------------------------------------------------------------------
diff --git a/mgmt/MultiFile.cc b/mgmt/MultiFile.cc
index e00b1e7..5643312 100644
--- a/mgmt/MultiFile.cc
+++ b/mgmt/MultiFile.cc
@@ -21,20 +21,20 @@
limitations under the License.
*/
-#include "libts.h"
+#include "ts/libts.h"
-#include "ink_platform.h"
-#include "ink_defs.h"
-#include "ink_assert.h"
-#include "ink_error.h"
-#include "ink_file.h"
-#include "ink_string.h"
-#include "ink_time.h"
+#include "ts/ink_platform.h"
+#include "ts/ink_defs.h"
+#include "ts/ink_assert.h"
+#include "ts/ink_error.h"
+#include "ts/ink_file.h"
+#include "ts/ink_string.h"
+#include "ts/ink_time.h"
#include "MgmtUtils.h"
#include "MultiFile.h"
#include "ExpandingArray.h"
-#include "TextBuffer.h"
+#include "ts/TextBuffer.h"
#include "WebMgmtUtils.h"
/****************************************************************************
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/mgmt/ProcessManager.cc
----------------------------------------------------------------------
diff --git a/mgmt/ProcessManager.cc b/mgmt/ProcessManager.cc
index 6c9bdf9..0b48350 100644
--- a/mgmt/ProcessManager.cc
+++ b/mgmt/ProcessManager.cc
@@ -22,15 +22,15 @@
*/
-#include "libts.h"
+#include "ts/libts.h"
#undef HTTP_CACHE
#include "InkAPIInternal.h"
#include "MgmtUtils.h"
#include "ProcessManager.h"
-#include "ink_apidefs.h"
+#include "ts/ink_apidefs.h"
#include "MgmtSocket.h"
-#include "I_Layout.h"
+#include "ts/I_Layout.h"
/*
* Global ProcessManager
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/mgmt/ProcessManager.h
----------------------------------------------------------------------
diff --git a/mgmt/ProcessManager.h b/mgmt/ProcessManager.h
index 8b89da6..ea2388c 100644
--- a/mgmt/ProcessManager.h
+++ b/mgmt/ProcessManager.h
@@ -38,9 +38,9 @@
#include "MgmtUtils.h"
#include "BaseManager.h"
-#include "ink_sock.h"
+#include "ts/ink_sock.h"
-#include "ink_apidefs.h"
+#include "ts/ink_apidefs.h"
class ConfigUpdateCbTable;
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/mgmt/ProxyConfig.cc
----------------------------------------------------------------------
diff --git a/mgmt/ProxyConfig.cc b/mgmt/ProxyConfig.cc
index 09545e2..13af7f8 100644
--- a/mgmt/ProxyConfig.cc
+++ b/mgmt/ProxyConfig.cc
@@ -21,7 +21,7 @@
limitations under the License.
*/
-#include "libts.h"
+#include "ts/libts.h"
#include "ProxyConfig.h"
#include "P_EventSystem.h"
#include "ts/TestBox.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/mgmt/ProxyConfig.h
----------------------------------------------------------------------
diff --git a/mgmt/ProxyConfig.h b/mgmt/ProxyConfig.h
index 8699296..d17fec5 100644
--- a/mgmt/ProxyConfig.h
+++ b/mgmt/ProxyConfig.h
@@ -31,7 +31,7 @@
#ifndef _Proxy_Config_h
#define _Proxy_Config_h
-#include "libts.h"
+#include "ts/libts.h"
#include "ProcessManager.h"
#include "I_EventSystem.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/mgmt/RecordsConfig.cc
----------------------------------------------------------------------
diff --git a/mgmt/RecordsConfig.cc b/mgmt/RecordsConfig.cc
index 7ee3154..74ff03c 100644
--- a/mgmt/RecordsConfig.cc
+++ b/mgmt/RecordsConfig.cc
@@ -22,7 +22,7 @@
*/
-#include "ink_config.h"
+#include "ts/ink_config.h"
#include "RecordsConfig.h"
#if TS_USE_REMOTE_UNWINDING
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/mgmt/RecordsConfigUtils.cc
----------------------------------------------------------------------
diff --git a/mgmt/RecordsConfigUtils.cc b/mgmt/RecordsConfigUtils.cc
index 7c16503..debfef6 100644
--- a/mgmt/RecordsConfigUtils.cc
+++ b/mgmt/RecordsConfigUtils.cc
@@ -21,9 +21,9 @@
limitations under the License.
*/
-#include "ink_config.h"
+#include "ts/ink_config.h"
#include "RecordsConfig.h"
-#include "ParseRules.h"
+#include "ts/ParseRules.h"
//-------------------------------------------------------------------------
// RecordsConfigOverrideFromEnvironment
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/mgmt/Rollback.cc
----------------------------------------------------------------------
diff --git a/mgmt/Rollback.cc b/mgmt/Rollback.cc
index a218a7d..05044ea 100644
--- a/mgmt/Rollback.cc
+++ b/mgmt/Rollback.cc
@@ -21,15 +21,15 @@
limitations under the License.
*/
-#include "libts.h"
+#include "ts/libts.h"
#include "LocalManager.h"
#include "Rollback.h"
#include "WebMgmtUtils.h"
#include "MgmtUtils.h"
#include "ExpandingArray.h"
#include "MgmtSocket.h"
-#include "ink_cap.h"
-#include "I_Layout.h"
+#include "ts/ink_cap.h"
+#include "ts/I_Layout.h"
#include "FileManager.h"
#define MAX_VERSION_DIGITS 11
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/mgmt/Rollback.h
----------------------------------------------------------------------
diff --git a/mgmt/Rollback.h b/mgmt/Rollback.h
index abc6388..082addb 100644
--- a/mgmt/Rollback.h
+++ b/mgmt/Rollback.h
@@ -32,11 +32,11 @@
*
****************************************************************************/
-#include "ink_platform.h"
-#include "ink_mutex.h"
-#include "ink_assert.h"
-#include "TextBuffer.h"
-#include "List.h"
+#include "ts/ink_platform.h"
+#include "ts/ink_mutex.h"
+#include "ts/ink_assert.h"
+#include "ts/TextBuffer.h"
+#include "ts/List.h"
class FileManager;
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/mgmt/WebMgmtUtils.cc
----------------------------------------------------------------------
diff --git a/mgmt/WebMgmtUtils.cc b/mgmt/WebMgmtUtils.cc
index b6572e2..0d97307 100644
--- a/mgmt/WebMgmtUtils.cc
+++ b/mgmt/WebMgmtUtils.cc
@@ -21,12 +21,12 @@
limitations under the License.
*/
-#include "libts.h"
+#include "ts/libts.h"
#include "LocalManager.h"
#include "MgmtUtils.h"
#include "WebMgmtUtils.h"
#include "MultiFile.h"
-#include "Regex.h"
+#include "ts/Regex.h"
/****************************************************************************
*
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/mgmt/WebMgmtUtils.h
----------------------------------------------------------------------
diff --git a/mgmt/WebMgmtUtils.h b/mgmt/WebMgmtUtils.h
index 0e00d29..a29c1c1 100644
--- a/mgmt/WebMgmtUtils.h
+++ b/mgmt/WebMgmtUtils.h
@@ -34,8 +34,8 @@
*
****************************************************************************/
-#include "ink_hash_table.h"
-#include "TextBuffer.h"
+#include "ts/ink_hash_table.h"
+#include "ts/TextBuffer.h"
#include "ExpandingArray.h"
#include "P_RecCore.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/mgmt/api/APITestCliRemote.cc
----------------------------------------------------------------------
diff --git a/mgmt/api/APITestCliRemote.cc b/mgmt/api/APITestCliRemote.cc
index a783e68..28328f3 100644
--- a/mgmt/api/APITestCliRemote.cc
+++ b/mgmt/api/APITestCliRemote.cc
@@ -93,13 +93,13 @@
* reset_stats - resets all statistics to default values
*/
-#include "ink_config.h"
-#include "ink_defs.h"
+#include "ts/ink_config.h"
+#include "ts/ink_defs.h"
#include <stdlib.h>
#include <string.h>
#include <stdio.h>
#include <strings.h>
-#include "ink_string.h"
+#include "ts/ink_string.h"
#include "mgmtapi.h"
#include "CfgContextUtils.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/mgmt/api/CfgContextDefs.h
----------------------------------------------------------------------
diff --git a/mgmt/api/CfgContextDefs.h b/mgmt/api/CfgContextDefs.h
index 30e3bd8..90d984a 100644
--- a/mgmt/api/CfgContextDefs.h
+++ b/mgmt/api/CfgContextDefs.h
@@ -28,7 +28,7 @@
#define _MGMT_API_DEFS_
#include "mgmtapi.h"
-#include "ink_llqueue.h"
+#include "ts/ink_llqueue.h"
// for buffer used temporarily to parse incoming commands.
#ifndef MAX_BUF_SIZE
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/mgmt/api/CfgContextImpl.cc
----------------------------------------------------------------------
diff --git a/mgmt/api/CfgContextImpl.cc b/mgmt/api/CfgContextImpl.cc
index 9a5f0e3..3756599 100644
--- a/mgmt/api/CfgContextImpl.cc
+++ b/mgmt/api/CfgContextImpl.cc
@@ -22,8 +22,8 @@
*/
-#include "libts.h"
-#include "ink_platform.h"
+#include "ts/libts.h"
+#include "ts/ink_platform.h"
#include "CfgContextImpl.h"
#include "CfgContextUtils.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/mgmt/api/CfgContextImpl.h
----------------------------------------------------------------------
diff --git a/mgmt/api/CfgContextImpl.h b/mgmt/api/CfgContextImpl.h
index 1c50084..db9364b 100644
--- a/mgmt/api/CfgContextImpl.h
+++ b/mgmt/api/CfgContextImpl.h
@@ -34,7 +34,7 @@
#include "CfgContextDefs.h"
#include "GenericParser.h" /* use for TokenList */
-#include "List.h"
+#include "ts/List.h"
/**********************************************************************
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/mgmt/api/CfgContextManager.cc
----------------------------------------------------------------------
diff --git a/mgmt/api/CfgContextManager.cc b/mgmt/api/CfgContextManager.cc
index d8a7196..315c61e 100644
--- a/mgmt/api/CfgContextManager.cc
+++ b/mgmt/api/CfgContextManager.cc
@@ -31,8 +31,8 @@
* Created by: Lan Tran
*
***************************************************************************/
-#include "ink_platform.h"
-#include "ink_string.h"
+#include "ts/ink_platform.h"
+#include "ts/ink_string.h"
#include "CfgContextManager.h"
#include "CfgContextUtils.h"
#include "CoreAPI.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/mgmt/api/CfgContextUtils.cc
----------------------------------------------------------------------
diff --git a/mgmt/api/CfgContextUtils.cc b/mgmt/api/CfgContextUtils.cc
index 873a6eb..2db5077 100644
--- a/mgmt/api/CfgContextUtils.cc
+++ b/mgmt/api/CfgContextUtils.cc
@@ -21,10 +21,10 @@
limitations under the License.
*/
-#include "libts.h"
-#include "ink_platform.h"
+#include "ts/libts.h"
+#include "ts/ink_platform.h"
#include "CfgContextUtils.h"
-#include "Tokenizer.h"
+#include "ts/Tokenizer.h"
/***************************************************************************
* Conversion Functions
***************************************************************************/
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/mgmt/api/CoreAPI.cc
----------------------------------------------------------------------
diff --git a/mgmt/api/CoreAPI.cc b/mgmt/api/CoreAPI.cc
index 48da1e2..e7d61c7 100644
--- a/mgmt/api/CoreAPI.cc
+++ b/mgmt/api/CoreAPI.cc
@@ -29,15 +29,15 @@
*
***************************************************************************/
-#include "libts.h"
+#include "ts/libts.h"
#include "MgmtUtils.h"
#include "LocalManager.h"
#include "ClusterCom.h"
#include "FileManager.h"
#include "Rollback.h"
#include "WebMgmtUtils.h"
-#include "Diags.h"
-#include "ink_hash_table.h"
+#include "ts/Diags.h"
+#include "ts/ink_hash_table.h"
#include "ExpandingArray.h"
//#include "I_AccCrypto.h"
@@ -45,8 +45,8 @@
#include "CoreAPIShared.h"
#include "CfgContextUtils.h"
#include "EventCallback.h"
-#include "I_Layout.h"
-#include "ink_cap.h"
+#include "ts/I_Layout.h"
+#include "ts/ink_cap.h"
// global variable
CallbackTable *local_event_callbacks;
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/mgmt/api/CoreAPI.h
----------------------------------------------------------------------
diff --git a/mgmt/api/CoreAPI.h b/mgmt/api/CoreAPI.h
index cb5ee88..c803299 100644
--- a/mgmt/api/CoreAPI.h
+++ b/mgmt/api/CoreAPI.h
@@ -27,12 +27,12 @@
#include <stdarg.h> // for va_list
-#include "ink_llqueue.h"
+#include "ts/ink_llqueue.h"
#include "MgmtDefs.h" // MgmtInt, MgmtFloat, etc
#include "mgmtapi.h"
#include "CfgContextDefs.h"
-#include "Tokenizer.h"
+#include "ts/Tokenizer.h"
TSMgmtError Init(const char *socket_path = NULL, TSInitOptionT options = TS_MGMT_OPT_DEFAULTS);
TSMgmtError Terminate();
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/mgmt/api/CoreAPIRemote.cc
----------------------------------------------------------------------
diff --git a/mgmt/api/CoreAPIRemote.cc b/mgmt/api/CoreAPIRemote.cc
index 60592ad..2626880 100644
--- a/mgmt/api/CoreAPIRemote.cc
+++ b/mgmt/api/CoreAPIRemote.cc
@@ -36,12 +36,12 @@
*
***************************************************************************/
-#include "ink_config.h"
-#include "ink_defs.h"
+#include "ts/ink_config.h"
+#include "ts/ink_defs.h"
#include <strings.h>
-#include "ink_string.h"
-#include "I_Layout.h"
-#include "ParseRules.h"
+#include "ts/ink_string.h"
+#include "ts/I_Layout.h"
+#include "ts/ParseRules.h"
#include "CoreAPI.h"
#include "CoreAPIShared.h"
#include "CfgContextUtils.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/mgmt/api/CoreAPIShared.cc
----------------------------------------------------------------------
diff --git a/mgmt/api/CoreAPIShared.cc b/mgmt/api/CoreAPIShared.cc
index 746dc60..188f40c 100644
--- a/mgmt/api/CoreAPIShared.cc
+++ b/mgmt/api/CoreAPIShared.cc
@@ -21,7 +21,7 @@
See the License for the specific language governing permissions and
limitations under the License.
*/
-#include "libts.h"
+#include "ts/libts.h"
#include "CoreAPIShared.h"
#include "MgmtSocket.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/mgmt/api/EventCallback.cc
----------------------------------------------------------------------
diff --git a/mgmt/api/EventCallback.cc b/mgmt/api/EventCallback.cc
index 4634cf3..f9736d8 100644
--- a/mgmt/api/EventCallback.cc
+++ b/mgmt/api/EventCallback.cc
@@ -29,8 +29,8 @@
*
***************************************************************************/
-#include "ink_config.h"
-#include "ink_memory.h"
+#include "ts/ink_config.h"
+#include "ts/ink_memory.h"
#include "EventCallback.h"
#include "CoreAPIShared.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/mgmt/api/EventCallback.h
----------------------------------------------------------------------
diff --git a/mgmt/api/EventCallback.h b/mgmt/api/EventCallback.h
index b9ea187..8965392 100644
--- a/mgmt/api/EventCallback.h
+++ b/mgmt/api/EventCallback.h
@@ -38,7 +38,7 @@
#ifndef _EVENT_CALLBACK_H_
#define _EVENT_CALLBACK_H_
-#include "ink_llqueue.h"
+#include "ts/ink_llqueue.h"
#include "mgmtapi.h"
#include "CoreAPIShared.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/mgmt/api/EventControlMain.cc
----------------------------------------------------------------------
diff --git a/mgmt/api/EventControlMain.cc b/mgmt/api/EventControlMain.cc
index 2f0ce77..c7a87bc 100644
--- a/mgmt/api/EventControlMain.cc
+++ b/mgmt/api/EventControlMain.cc
@@ -29,7 +29,7 @@
*
***************************************************************************/
-#include "libts.h"
+#include "ts/libts.h"
#include "LocalManager.h"
#include "MgmtSocket.h"
#include "MgmtMarshall.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/mgmt/api/GenericParser.cc
----------------------------------------------------------------------
diff --git a/mgmt/api/GenericParser.cc b/mgmt/api/GenericParser.cc
index eb97e4f..575fd40 100644
--- a/mgmt/api/GenericParser.cc
+++ b/mgmt/api/GenericParser.cc
@@ -21,7 +21,7 @@
limitations under the License.
*/
-#include "libts.h"
+#include "ts/libts.h"
#include "GenericParser.h"
/***************************************************************************
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/mgmt/api/GenericParser.h
----------------------------------------------------------------------
diff --git a/mgmt/api/GenericParser.h b/mgmt/api/GenericParser.h
index 954681e..935069a 100644
--- a/mgmt/api/GenericParser.h
+++ b/mgmt/api/GenericParser.h
@@ -30,9 +30,9 @@
#define _GENERIC_PARSER_H_
#include <string.h>
-#include "ink_assert.h"
-#include "Tokenizer.h"
-#include "List.h"
+#include "ts/ink_assert.h"
+#include "ts/Tokenizer.h"
+#include "ts/List.h"
#include "mgmtapi.h" // INKFileNameT
#define MIN_CONFIG_TOKEN 1
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/mgmt/api/INKMgmtAPI.cc
----------------------------------------------------------------------
diff --git a/mgmt/api/INKMgmtAPI.cc b/mgmt/api/INKMgmtAPI.cc
index d10bcf8..4d56070 100644
--- a/mgmt/api/INKMgmtAPI.cc
+++ b/mgmt/api/INKMgmtAPI.cc
@@ -29,9 +29,9 @@
*
*
***************************************************************************/
-#include "libts.h"
+#include "ts/libts.h"
#include <limits.h>
-#include "I_Layout.h"
+#include "ts/I_Layout.h"
#include "mgmtapi.h"
#include "CfgContextManager.h"
@@ -40,7 +40,7 @@
#include "CoreAPI.h"
#include "CoreAPIShared.h"
-#include "TextBuffer.h"
+#include "ts/TextBuffer.h"
// forward declarations
void init_pdss_format(TSPdSsFormat &info);
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/mgmt/api/Makefile.am
----------------------------------------------------------------------
diff --git a/mgmt/api/Makefile.am b/mgmt/api/Makefile.am
index 62adea1..e479a77 100644
--- a/mgmt/api/Makefile.am
+++ b/mgmt/api/Makefile.am
@@ -22,8 +22,6 @@ SUBDIRS = include
AM_CPPFLAGS = \
$(iocore_include_dirs) \
-I$(top_srcdir)/lib/records \
- -I$(top_srcdir)/lib/ts \
- -I$(top_builddir)/lib/ts \
-I$(top_srcdir)/mgmt \
-I$(top_srcdir)/mgmt/cluster \
-I$(top_srcdir)/mgmt/utils \
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/mgmt/api/NetworkMessage.cc
----------------------------------------------------------------------
diff --git a/mgmt/api/NetworkMessage.cc b/mgmt/api/NetworkMessage.cc
index 160bed8..9fb5e21 100644
--- a/mgmt/api/NetworkMessage.cc
+++ b/mgmt/api/NetworkMessage.cc
@@ -21,10 +21,10 @@
limitations under the License.
*/
-#include "ink_config.h"
-#include "ink_defs.h"
-#include "ink_assert.h"
-#include "ink_memory.h"
+#include "ts/ink_config.h"
+#include "ts/ink_defs.h"
+#include "ts/ink_assert.h"
+#include "ts/ink_memory.h"
#include "mgmtapi.h"
#include "NetworkMessage.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/mgmt/api/NetworkUtilsLocal.cc
----------------------------------------------------------------------
diff --git a/mgmt/api/NetworkUtilsLocal.cc b/mgmt/api/NetworkUtilsLocal.cc
index 7bd6c81..a627b2d 100644
--- a/mgmt/api/NetworkUtilsLocal.cc
+++ b/mgmt/api/NetworkUtilsLocal.cc
@@ -30,9 +30,9 @@
*
***************************************************************************/
-#include "ink_platform.h"
-#include "ink_sock.h"
-#include "Diags.h"
+#include "ts/ink_platform.h"
+#include "ts/ink_sock.h"
+#include "ts/Diags.h"
#include "MgmtUtils.h"
#include "MgmtSocket.h"
#include "MgmtMarshall.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/mgmt/api/NetworkUtilsLocal.h
----------------------------------------------------------------------
diff --git a/mgmt/api/NetworkUtilsLocal.h b/mgmt/api/NetworkUtilsLocal.h
index 0dc0547..791bc10 100644
--- a/mgmt/api/NetworkUtilsLocal.h
+++ b/mgmt/api/NetworkUtilsLocal.h
@@ -24,7 +24,7 @@
#ifndef _NETWORK_UTILS_LOCAL_H_
#define _NETWORK_UTILS_LOCAL_H_
-#include "ink_defs.h"
+#include "ts/ink_defs.h"
#include "mgmtapi.h"
/*****************************************************************************
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/mgmt/api/NetworkUtilsRemote.cc
----------------------------------------------------------------------
diff --git a/mgmt/api/NetworkUtilsRemote.cc b/mgmt/api/NetworkUtilsRemote.cc
index 5d70366..f70768a 100644
--- a/mgmt/api/NetworkUtilsRemote.cc
+++ b/mgmt/api/NetworkUtilsRemote.cc
@@ -21,12 +21,12 @@
limitations under the License.
*/
-#include "ink_config.h"
-#include "ink_defs.h"
-#include "ink_sock.h"
-#include "ink_string.h"
-#include "ink_memory.h"
-#include "I_Layout.h"
+#include "ts/ink_config.h"
+#include "ts/ink_defs.h"
+#include "ts/ink_sock.h"
+#include "ts/ink_string.h"
+#include "ts/ink_memory.h"
+#include "ts/I_Layout.h"
#include "NetworkUtilsRemote.h"
#include "CoreAPI.h"
#include "CoreAPIShared.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/mgmt/api/TSControlMain.cc
----------------------------------------------------------------------
diff --git a/mgmt/api/TSControlMain.cc b/mgmt/api/TSControlMain.cc
index a771ca3..54113f0 100644
--- a/mgmt/api/TSControlMain.cc
+++ b/mgmt/api/TSControlMain.cc
@@ -31,7 +31,7 @@
***************************************************************************/
#include "mgmtapi.h"
-#include "libts.h"
+#include "ts/libts.h"
#include "LocalManager.h"
#include "MgmtUtils.h"
#include "MgmtSocket.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/mgmt/cluster/ClusterCom.cc
----------------------------------------------------------------------
diff --git a/mgmt/cluster/ClusterCom.cc b/mgmt/cluster/ClusterCom.cc
index 5ec30ed..2c814a9 100644
--- a/mgmt/cluster/ClusterCom.cc
+++ b/mgmt/cluster/ClusterCom.cc
@@ -31,11 +31,11 @@
*
*/
-#include "libts.h"
+#include "ts/libts.h"
-#include "I_Version.h"
+#include "ts/I_Version.h"
-#include "TextBuffer.h"
+#include "ts/TextBuffer.h"
#include "MgmtSocket.h"
#include "LocalManager.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/mgmt/cluster/ClusterCom.h
----------------------------------------------------------------------
diff --git a/mgmt/cluster/ClusterCom.h b/mgmt/cluster/ClusterCom.h
index 7687f2f..c0ecc86 100644
--- a/mgmt/cluster/ClusterCom.h
+++ b/mgmt/cluster/ClusterCom.h
@@ -42,9 +42,9 @@
#ifndef _CLUSTER_COM_H
#define _CLUSTER_COM_H
-#include "ink_platform.h"
+#include "ts/ink_platform.h"
#include "P_RecDefs.h"
-#include "I_Version.h"
+#include "ts/I_Version.h"
#include "Rollback.h"
class FileManager;
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/mgmt/cluster/Makefile.am
----------------------------------------------------------------------
diff --git a/mgmt/cluster/Makefile.am b/mgmt/cluster/Makefile.am
index 404bffc..34ca779 100644
--- a/mgmt/cluster/Makefile.am
+++ b/mgmt/cluster/Makefile.am
@@ -19,8 +19,6 @@
AM_CPPFLAGS = \
-I$(top_srcdir)/lib/records \
- -I$(top_srcdir)/lib/ts \
- -I$(top_builddir)/lib/ts \
-I$(top_srcdir)/mgmt \
-I$(top_srcdir)/mgmt/api/include \
-I$(top_srcdir)/mgmt/utils \
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/mgmt/cluster/VMap.cc
----------------------------------------------------------------------
diff --git a/mgmt/cluster/VMap.cc b/mgmt/cluster/VMap.cc
index 710a44f..e48987e 100644
--- a/mgmt/cluster/VMap.cc
+++ b/mgmt/cluster/VMap.cc
@@ -28,14 +28,14 @@
*
*
*/
-#include "ink_platform.h"
+#include "ts/ink_platform.h"
#include "LocalManager.h"
#include "VMap.h"
#include "ClusterCom.h"
#include "MgmtUtils.h"
#include "P_RecLocal.h"
-#include "I_Layout.h"
+#include "ts/I_Layout.h"
// for linux and freebsd
#ifndef C_ISUID
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/mgmt/cluster/VMap.h
----------------------------------------------------------------------
diff --git a/mgmt/cluster/VMap.h b/mgmt/cluster/VMap.h
index 2959ab8..6bdf0e5 100644
--- a/mgmt/cluster/VMap.h
+++ b/mgmt/cluster/VMap.h
@@ -24,7 +24,7 @@
#ifndef _VMAP_H
#define _VMAP_H
-#include "libts.h"
+#include "ts/libts.h"
#define MAX_INTERFACE 16
#define MAX_SUB_ID 8
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/mgmt/utils/ExpandingArray.cc
----------------------------------------------------------------------
diff --git a/mgmt/utils/ExpandingArray.cc b/mgmt/utils/ExpandingArray.cc
index 43d64e1..d5e21b5 100644
--- a/mgmt/utils/ExpandingArray.cc
+++ b/mgmt/utils/ExpandingArray.cc
@@ -21,8 +21,8 @@
limitations under the License.
*/
-#include "ink_platform.h"
-#include "ink_memory.h"
+#include "ts/ink_platform.h"
+#include "ts/ink_memory.h"
#include "ExpandingArray.h"
ExpandingArray::ExpandingArray(int initialSize, bool freeContents)
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/mgmt/utils/Makefile.am
----------------------------------------------------------------------
diff --git a/mgmt/utils/Makefile.am b/mgmt/utils/Makefile.am
index 4324349..31c8513 100644
--- a/mgmt/utils/Makefile.am
+++ b/mgmt/utils/Makefile.am
@@ -25,8 +25,6 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/lib/tsconfig \
-I$(top_srcdir)/proxy \
-I$(top_srcdir)/lib/records \
- -I$(top_srcdir)/lib/ts \
- -I$(top_builddir)/lib/ts \
-I$(top_srcdir)/lib \
@OPENSSL_INCLUDES@
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/mgmt/utils/MgmtHashTable.h
----------------------------------------------------------------------
diff --git a/mgmt/utils/MgmtHashTable.h b/mgmt/utils/MgmtHashTable.h
index 1dbc12b..f1b7219 100644
--- a/mgmt/utils/MgmtHashTable.h
+++ b/mgmt/utils/MgmtHashTable.h
@@ -33,9 +33,9 @@
#ifndef _MGMT_HASH_TABLE_H
#define _MGMT_HASH_TABLE_H
-#include "ink_memory.h"
-#include "ink_hash_table.h"
-#include "ink_mutex.h"
+#include "ts/ink_memory.h"
+#include "ts/ink_hash_table.h"
+#include "ts/ink_mutex.h"
class MgmtHashTable
{
[3/7] trafficserver git commit: TS-3759 Eliminate -Ilib/ts
Posted by zw...@apache.org.
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/shared/DiagsConfig.cc
----------------------------------------------------------------------
diff --git a/proxy/shared/DiagsConfig.cc b/proxy/shared/DiagsConfig.cc
index 5103f4c..c4da2a8 100644
--- a/proxy/shared/DiagsConfig.cc
+++ b/proxy/shared/DiagsConfig.cc
@@ -21,8 +21,8 @@
limitations under the License.
*/
-#include "libts.h"
-#include "I_Layout.h"
+#include "ts/libts.h"
+#include "ts/I_Layout.h"
#include "DiagsConfig.h"
#include "P_RecCore.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/shared/DiagsConfig.h
----------------------------------------------------------------------
diff --git a/proxy/shared/DiagsConfig.h b/proxy/shared/DiagsConfig.h
index ad27d8e..f6ac82c 100644
--- a/proxy/shared/DiagsConfig.h
+++ b/proxy/shared/DiagsConfig.h
@@ -23,7 +23,7 @@
#ifndef __DIAGSCONFIG_H__
#define __DIAGSCONFIG_H__
-#include "Diags.h"
+#include "ts/Diags.h"
struct DiagsConfig {
void reconfigure_diags();
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/shared/Error.cc
----------------------------------------------------------------------
diff --git a/proxy/shared/Error.cc b/proxy/shared/Error.cc
index d1c451e..8a72320 100644
--- a/proxy/shared/Error.cc
+++ b/proxy/shared/Error.cc
@@ -32,7 +32,7 @@
#include "proxy/Main.h"
#include "Error.h"
#include <time.h>
-#include "ink_platform.h"
+#include "ts/ink_platform.h"
ErrorClass::~ErrorClass()
{
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/shared/Error.h
----------------------------------------------------------------------
diff --git a/proxy/shared/Error.h b/proxy/shared/Error.h
index 6710c36..8bc7faf 100644
--- a/proxy/shared/Error.h
+++ b/proxy/shared/Error.h
@@ -34,8 +34,8 @@
#if !defined _Error_h_
#define _Error_h_
-#include "libts.h"
-#include "Diags.h"
+#include "ts/libts.h"
+#include "ts/Diags.h"
//////////////////////////////////////////////////////////////////////////////
//
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/shared/InkXml.cc
----------------------------------------------------------------------
diff --git a/proxy/shared/InkXml.cc b/proxy/shared/InkXml.cc
index 0f4d1e2..f48e135 100644
--- a/proxy/shared/InkXml.cc
+++ b/proxy/shared/InkXml.cc
@@ -26,7 +26,7 @@
***************************************************************************/
-#include "libts.h"
+#include "ts/libts.h"
#include "InkXml.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/shared/InkXml.h
----------------------------------------------------------------------
diff --git a/proxy/shared/InkXml.h b/proxy/shared/InkXml.h
index 28f494a..ec9c7c8 100644
--- a/proxy/shared/InkXml.h
+++ b/proxy/shared/InkXml.h
@@ -25,7 +25,7 @@
#ifndef INK_XML_H
#define INK_XML_H
-#include "List.h"
+#include "ts/List.h"
/*-------------------------------------------------------------------------
InkXml.h
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/shared/Makefile.am
----------------------------------------------------------------------
diff --git a/proxy/shared/Makefile.am b/proxy/shared/Makefile.am
index f454e23..577f8b3 100644
--- a/proxy/shared/Makefile.am
+++ b/proxy/shared/Makefile.am
@@ -26,8 +26,6 @@ noinst_LIBRARIES = \
AM_CPPFLAGS = \
$(iocore_include_dirs) \
-I$(top_srcdir)/lib/records \
- -I$(top_srcdir)/lib/ts \
- -I$(top_builddir)/lib/ts \
-I$(top_srcdir)/mgmt \
-I$(top_srcdir)/mgmt/api \
-I$(top_srcdir)/mgmt/api/include \
@@ -38,8 +36,7 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/proxy/http \
-I$(top_srcdir)/proxy/hdrs \
-I$(top_srcdir)/proxy/logging \
- -I$(top_srcdir)/lib \
- -I$(top_builddir)/lib
+ -I$(top_srcdir)/lib
liberror_a_SOURCES = \
Error.cc
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/shared/UglyLogStubs.cc
----------------------------------------------------------------------
diff --git a/proxy/shared/UglyLogStubs.cc b/proxy/shared/UglyLogStubs.cc
index 5f8183c..ecb48bc 100644
--- a/proxy/shared/UglyLogStubs.cc
+++ b/proxy/shared/UglyLogStubs.cc
@@ -25,7 +25,7 @@
// This is total BS, because our libraries are riddled with cross dependencies.
// TODO: Clean up the dependency mess, and get rid of this.
-#include "libts.h"
+#include "ts/libts.h"
#include "LogObject.h"
#if defined(solaris)
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/spdy/Makefile.am
----------------------------------------------------------------------
diff --git a/proxy/spdy/Makefile.am b/proxy/spdy/Makefile.am
index 01cba4d..d8f7c86 100644
--- a/proxy/spdy/Makefile.am
+++ b/proxy/spdy/Makefile.am
@@ -21,8 +21,6 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/proxy/api/ts \
-I$(top_srcdir)/lib \
-I$(top_srcdir)/lib/records \
- -I$(top_srcdir)/lib/ts \
- -I$(top_builddir)/lib/ts \
-I$(top_srcdir)/proxy \
-I$(top_srcdir)/proxy/http \
-I$(top_srcdir)/proxy/api \
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/test_xml_parser.cc
----------------------------------------------------------------------
diff --git a/proxy/test_xml_parser.cc b/proxy/test_xml_parser.cc
index 7f17d0d..88f362c 100644
--- a/proxy/test_xml_parser.cc
+++ b/proxy/test_xml_parser.cc
@@ -23,7 +23,7 @@
#include <stdio.h>
#include "InkXml.h"
-#include <ink_assert.h>
+#include "ts/ink_assert.h"
int
main()
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/tools/Makefile.am
----------------------------------------------------------------------
diff --git a/tools/Makefile.am b/tools/Makefile.am
index 91cc72e..1c28af6 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -25,7 +25,6 @@ pkgconfig_DATA = trafficserver.pc
AM_LDFLAGS = @EXTRA_CXX_LDFLAGS@ @LIBTOOL_LINK_FLAGS@
AM_CPPFLAGS = $(iocore_include_dirs) \
-I$(top_srcdir)/lib \
- -I$(top_srcdir)/lib/ts -I$(top_builddir)/lib/ts \
-I$(top_srcdir)/lib/wccp
if BUILD_TEST_TOOLS
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/tools/http_load/http_load.c
----------------------------------------------------------------------
diff --git a/tools/http_load/http_load.c b/tools/http_load/http_load.c
index c0d1e93..1737d46 100644
--- a/tools/http_load/http_load.c
+++ b/tools/http_load/http_load.c
@@ -25,7 +25,7 @@
** SUCH DAMAGE.
*/
-#include "ink_config.h"
+#include "ts/ink_config.h"
#include <sys/epoll.h>
#include <unistd.h>
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/tools/jtest/jtest.cc
----------------------------------------------------------------------
diff --git a/tools/jtest/jtest.cc b/tools/jtest/jtest.cc
index f1c38f5..ee276b5 100644
--- a/tools/jtest/jtest.cc
+++ b/tools/jtest/jtest.cc
@@ -51,14 +51,14 @@
#include <sys/time.h>
#include <stdlib.h>
-#include "ink_defs.h"
-#include "ink_memory.h"
-#include "ink_assert.h"
-#include "INK_MD5.h"
-#include "ParseRules.h"
-#include "ink_time.h"
-#include "ink_args.h"
-#include "I_Version.h"
+#include "ts/ink_defs.h"
+#include "ts/ink_memory.h"
+#include "ts/ink_assert.h"
+#include "ts/INK_MD5.h"
+#include "ts/ParseRules.h"
+#include "ts/ink_time.h"
+#include "ts/ink_args.h"
+#include "ts/I_Version.h"
/*
FTP - Traffic Server Template
[7/7] trafficserver git commit: TS-3759 Eliminate -Ilib/ts,
checkpoint 4
Posted by zw...@apache.org.
TS-3759 Eliminate -Ilib/ts, checkpoint 4
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/bcec70dc
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/bcec70dc
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/bcec70dc
Branch: refs/heads/master
Commit: bcec70dc84a9a3eefc9a037c5a43e3422d4fc29a
Parents: 3fe162d
Author: Leif Hedstrom <zw...@apache.org>
Authored: Thu Jul 16 14:22:01 2015 -0600
Committer: Leif Hedstrom <zw...@apache.org>
Committed: Thu Jul 16 14:49:52 2015 -0600
----------------------------------------------------------------------
cmd/traffic_layout/traffic_layout.cc | 1 -
iocore/cache/CacheHosting.cc | 2 ++
iocore/cache/P_CacheInternal.h | 1 +
iocore/cache/RamCacheCLFUS.cc | 1 +
iocore/cache/Store.cc | 3 +++
iocore/cluster/ClusterMachine.cc | 3 ++-
iocore/dns/SplitDNS.cc | 1 +
iocore/eventsystem/I_Lock.h | 1 +
iocore/eventsystem/P_UnixSocketManager.h | 3 ++-
iocore/eventsystem/Thread.cc | 1 +
iocore/hostdb/HostDB.cc | 1 +
iocore/net/P_SSLConfig.h | 1 +
iocore/net/SSLClientUtils.cc | 2 +-
iocore/net/SSLNetVConnection.cc | 1 +
iocore/net/SSLUtils.cc | 4 ++--
iocore/net/Socks.cc | 2 ++
iocore/net/UnixNetProcessor.cc | 2 ++
iocore/net/UnixNetVConnection.cc | 1 +
iocore/utils/I_Machine.h | 2 ++
lib/records/RecProcess.cc | 1 +
lib/ts/Makefile.am | 1 -
lib/ts/Regression.cc | 3 ++-
lib/ts/TestBox.h | 3 ++-
lib/ts/TextBuffer.cc | 1 +
lib/ts/X509HostnameValidator.h | 2 ++
lib/ts/ink_file.cc | 5 ++++-
lib/ts/ink_platform.h | 2 --
lib/ts/ink_rand.cc | 3 ++-
lib/ts/ink_stack_trace.cc | 3 ++-
lib/ts/ink_syslog.cc | 2 +-
lib/ts/ink_thread.cc | 1 +
mgmt/BaseManager.h | 1 +
mgmt/FileManager.cc | 3 ++-
mgmt/ProxyConfig.cc | 2 +-
mgmt/WebMgmtUtils.cc | 6 +++++-
mgmt/api/EventControlMain.cc | 3 ++-
mgmt/api/INKMgmtAPI.cc | 4 +++-
mgmt/cluster/ClusterCom.cc | 4 +++-
proxy/CacheControl.h | 1 +
proxy/ControlMatcher.cc | 1 +
proxy/ControlMatcher.h | 1 +
proxy/ICPConfig.cc | 1 +
proxy/InkAPI.cc | 1 +
proxy/InkAPITest.cc | 2 ++
proxy/Main.cc | 9 ++++++---
proxy/ParentSelection.cc | 2 ++
proxy/ParentSelection.h | 3 +--
proxy/RegressionSM.h | 2 ++
proxy/http/HttpBodyFactory.cc | 2 ++
proxy/http/HttpClientSession.h | 1 +
proxy/http/HttpConfig.h | 1 +
proxy/http/HttpPages.h | 2 +-
proxy/http/remap/RemapConfig.cc | 1 +
proxy/http2/Http2ClientSession.cc | 1 +
proxy/logcat.cc | 3 ++-
proxy/logging/Log.h | 3 +++
proxy/logging/LogFile.cc | 2 ++
proxy/logging/LogObject.cc | 4 ++--
proxy/logging/LogSock.cc | 2 ++
proxy/logging/LogStandalone.cc | 1 +
proxy/logging/LogUtils.cc | 1 +
proxy/logstats.cc | 4 +++-
proxy/sac.cc | 1 +
63 files changed, 104 insertions(+), 31 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/bcec70dc/cmd/traffic_layout/traffic_layout.cc
----------------------------------------------------------------------
diff --git a/cmd/traffic_layout/traffic_layout.cc b/cmd/traffic_layout/traffic_layout.cc
index efa166c..cd426f4 100644
--- a/cmd/traffic_layout/traffic_layout.cc
+++ b/cmd/traffic_layout/traffic_layout.cc
@@ -23,7 +23,6 @@
#include "ts/ink_platform.h"
#include "ts/ink_args.h"
-#include "ts/ink_config.h"
#include "ts/I_Version.h"
#include "ts/I_Layout.h"
#include "I_RecProcess.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/bcec70dc/iocore/cache/CacheHosting.cc
----------------------------------------------------------------------
diff --git a/iocore/cache/CacheHosting.cc b/iocore/cache/CacheHosting.cc
index 3281f79..4d8cb87 100644
--- a/iocore/cache/CacheHosting.cc
+++ b/iocore/cache/CacheHosting.cc
@@ -23,6 +23,8 @@
#include "P_Cache.h"
#include "ts/I_Layout.h"
+#include "ts/HostLookup.h"
+#include "ts/Tokenizer.h"
extern int gndisks;
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/bcec70dc/iocore/cache/P_CacheInternal.h
----------------------------------------------------------------------
diff --git a/iocore/cache/P_CacheInternal.h b/iocore/cache/P_CacheInternal.h
index e576c5f..74efade 100644
--- a/iocore/cache/P_CacheInternal.h
+++ b/iocore/cache/P_CacheInternal.h
@@ -26,6 +26,7 @@
#define _P_CACHE_INTERNAL_H__
#include "ts/ink_platform.h"
+#include "ts/InkErrno.h"
#ifdef HTTP_CACHE
#include "HTTP.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/bcec70dc/iocore/cache/RamCacheCLFUS.cc
----------------------------------------------------------------------
diff --git a/iocore/cache/RamCacheCLFUS.cc b/iocore/cache/RamCacheCLFUS.cc
index 5681b1f..0e051b2 100644
--- a/iocore/cache/RamCacheCLFUS.cc
+++ b/iocore/cache/RamCacheCLFUS.cc
@@ -26,6 +26,7 @@
#include "P_Cache.h"
#include "I_Tasks.h"
+#include "ts/fastlz.h"
#if TS_HAS_LIBZ
#include <zlib.h>
#endif
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/bcec70dc/iocore/cache/Store.cc
----------------------------------------------------------------------
diff --git a/iocore/cache/Store.cc b/iocore/cache/Store.cc
index 379eb04..6d41e15 100644
--- a/iocore/cache/Store.cc
+++ b/iocore/cache/Store.cc
@@ -24,6 +24,9 @@
#include "ts/ink_platform.h"
#include "P_Cache.h"
#include "ts/I_Layout.h"
+#include "ts/ink_file.h"
+#include "ts/Tokenizer.h"
+#include "ts/SimpleTokenizer.h"
#if HAVE_LINUX_MAJOR_H
#include <linux/major.h>
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/bcec70dc/iocore/cluster/ClusterMachine.cc
----------------------------------------------------------------------
diff --git a/iocore/cluster/ClusterMachine.cc b/iocore/cluster/ClusterMachine.cc
index 7173b11..3453320 100644
--- a/iocore/cluster/ClusterMachine.cc
+++ b/iocore/cluster/ClusterMachine.cc
@@ -26,7 +26,8 @@
Machine.cc
****************************************************************************/
-#include "ts/ink_config.h"
+#include "ts/ink_platform.h"
+#include "ts/ink_file.h"
#include <unistd.h>
#include "P_Cluster.h"
#include "ts/I_Layout.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/bcec70dc/iocore/dns/SplitDNS.cc
----------------------------------------------------------------------
diff --git a/iocore/dns/SplitDNS.cc b/iocore/dns/SplitDNS.cc
index ca88de6..346e4a9 100644
--- a/iocore/dns/SplitDNS.cc
+++ b/iocore/dns/SplitDNS.cc
@@ -29,6 +29,7 @@
****************************************************************************/
#include "ts/ink_platform.h"
+#include "ts/Tokenizer.h"
#ifdef SPLIT_DNS
#include <sys/types.h>
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/bcec70dc/iocore/eventsystem/I_Lock.h
----------------------------------------------------------------------
diff --git a/iocore/eventsystem/I_Lock.h b/iocore/eventsystem/I_Lock.h
index f8dc670..e90d1bf 100644
--- a/iocore/eventsystem/I_Lock.h
+++ b/iocore/eventsystem/I_Lock.h
@@ -25,6 +25,7 @@
#define _I_Lock_h_
#include "ts/ink_platform.h"
+#include "ts/Diags.h"
#include "I_Thread.h"
#define MAX_LOCK_TIME HRTIME_MSECONDS(200)
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/bcec70dc/iocore/eventsystem/P_UnixSocketManager.h
----------------------------------------------------------------------
diff --git a/iocore/eventsystem/P_UnixSocketManager.h b/iocore/eventsystem/P_UnixSocketManager.h
index 210b5e4..2582c5a 100644
--- a/iocore/eventsystem/P_UnixSocketManager.h
+++ b/iocore/eventsystem/P_UnixSocketManager.h
@@ -32,7 +32,8 @@
#ifndef _P_UnixSocketManager_h_
#define _P_UnixSocketManager_h_
-#include "ts/libts.h"
+#include "ts/ink_platform.h"
+#include "ts/ink_sock.h"
#include "I_SocketManager.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/bcec70dc/iocore/eventsystem/Thread.cc
----------------------------------------------------------------------
diff --git a/iocore/eventsystem/Thread.cc b/iocore/eventsystem/Thread.cc
index bc94737..41b17ca 100644
--- a/iocore/eventsystem/Thread.cc
+++ b/iocore/eventsystem/Thread.cc
@@ -29,6 +29,7 @@
**************************************************************************/
#include "P_EventSystem.h"
+#include "ts/ink_string.h"
///////////////////////////////////////////////
// Common Interface impl //
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/bcec70dc/iocore/hostdb/HostDB.cc
----------------------------------------------------------------------
diff --git a/iocore/hostdb/HostDB.cc b/iocore/hostdb/HostDB.cc
index 6ed6937..53d13d2 100644
--- a/iocore/hostdb/HostDB.cc
+++ b/iocore/hostdb/HostDB.cc
@@ -26,6 +26,7 @@
#include "P_HostDB.h"
#include "ts/I_Layout.h"
#include "Show.h"
+#include "ts/Tokenizer.h"
#include <vector>
#include <algorithm>
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/bcec70dc/iocore/net/P_SSLConfig.h
----------------------------------------------------------------------
diff --git a/iocore/net/P_SSLConfig.h b/iocore/net/P_SSLConfig.h
index 3d942f6..a8d5eb7 100644
--- a/iocore/net/P_SSLConfig.h
+++ b/iocore/net/P_SSLConfig.h
@@ -33,6 +33,7 @@
#include "ProxyConfig.h"
#include "SSLSessionCache.h"
+#include "ts/ink_inet.h"
struct SSLCertLookup;
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/bcec70dc/iocore/net/SSLClientUtils.cc
----------------------------------------------------------------------
diff --git a/iocore/net/SSLClientUtils.cc b/iocore/net/SSLClientUtils.cc
index c37b11f..be78389 100644
--- a/iocore/net/SSLClientUtils.cc
+++ b/iocore/net/SSLClientUtils.cc
@@ -22,12 +22,12 @@
#include "ts/ink_config.h"
#include "records/I_RecHttp.h"
#include "ts/ink_platform.h"
+#include "ts/X509HostnameValidator.h"
#include "P_Net.h"
#include "P_SSLClientUtils.h"
#include <openssl/err.h>
#include <openssl/pem.h>
-#include <openssl/x509.h>
#if (OPENSSL_VERSION_NUMBER >= 0x10000000L) // openssl returns a const SSL_METHOD
typedef const SSL_METHOD *ink_ssl_method_t;
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/bcec70dc/iocore/net/SSLNetVConnection.cc
----------------------------------------------------------------------
diff --git a/iocore/net/SSLNetVConnection.cc b/iocore/net/SSLNetVConnection.cc
index d6fc98b..e06f749 100644
--- a/iocore/net/SSLNetVConnection.cc
+++ b/iocore/net/SSLNetVConnection.cc
@@ -21,6 +21,7 @@
limitations under the License.
*/
#include "ts/ink_config.h"
+#include "ts/EventNotify.h"
#include "records/I_RecHttp.h"
#include "P_Net.h"
#include "P_SSLNextProtocolSet.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/bcec70dc/iocore/net/SSLUtils.cc
----------------------------------------------------------------------
diff --git a/iocore/net/SSLUtils.cc b/iocore/net/SSLUtils.cc
index 29312a7..e9f30a6 100644
--- a/iocore/net/SSLUtils.cc
+++ b/iocore/net/SSLUtils.cc
@@ -19,9 +19,9 @@
limitations under the License.
*/
-#include "ts/ink_config.h"
-#include "records/I_RecHttp.h"
#include "ts/ink_platform.h"
+#include "ts/SimpleTokenizer.h"
+#include "records/I_RecHttp.h"
#include "ts/I_Layout.h"
#include "P_Net.h"
#include "ts/ink_cap.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/bcec70dc/iocore/net/Socks.cc
----------------------------------------------------------------------
diff --git a/iocore/net/Socks.cc b/iocore/net/Socks.cc
index 08239e8..78ccd9a 100644
--- a/iocore/net/Socks.cc
+++ b/iocore/net/Socks.cc
@@ -32,6 +32,8 @@
#include "P_Net.h"
#include "ts/I_Layout.h"
+#include "ts/ink_sock.h"
+#include "ts/InkErrno.h"
#include <ts/IpMapConf.h>
socks_conf_struct *g_socks_conf_stuff = 0;
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/bcec70dc/iocore/net/UnixNetProcessor.cc
----------------------------------------------------------------------
diff --git a/iocore/net/UnixNetProcessor.cc b/iocore/net/UnixNetProcessor.cc
index e03f15c..89bb63a 100644
--- a/iocore/net/UnixNetProcessor.cc
+++ b/iocore/net/UnixNetProcessor.cc
@@ -22,6 +22,8 @@
*/
#include "P_Net.h"
+#include "ts/InkErrno.h"
+#include "ts/ink_sock.h"
// For Stat Pages
#include "StatPages.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/bcec70dc/iocore/net/UnixNetVConnection.cc
----------------------------------------------------------------------
diff --git a/iocore/net/UnixNetVConnection.cc b/iocore/net/UnixNetVConnection.cc
index 129cbab..f32a25f 100644
--- a/iocore/net/UnixNetVConnection.cc
+++ b/iocore/net/UnixNetVConnection.cc
@@ -23,6 +23,7 @@
#include "P_Net.h"
#include "ts/ink_platform.h"
+#include "ts/InkErrno.h"
#include "Log.h"
#define STATE_VIO_OFFSET ((uintptr_t) & ((NetState *)0)->vio)
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/bcec70dc/iocore/utils/I_Machine.h
----------------------------------------------------------------------
diff --git a/iocore/utils/I_Machine.h b/iocore/utils/I_Machine.h
index b438f62..8414f3d 100644
--- a/iocore/utils/I_Machine.h
+++ b/iocore/utils/I_Machine.h
@@ -31,6 +31,8 @@
#ifndef _I_Machine_h
#define _I_Machine_h
+#include "ts/ink_inet.h"
+
/**
The Machine is a simple place holder for the hostname and the ip
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/bcec70dc/lib/records/RecProcess.cc
----------------------------------------------------------------------
diff --git a/lib/records/RecProcess.cc b/lib/records/RecProcess.cc
index 8f31ceb..5cefe0f 100644
--- a/lib/records/RecProcess.cc
+++ b/lib/records/RecProcess.cc
@@ -22,6 +22,7 @@
*/
#include "ts/ink_platform.h"
+#include "ts/EventNotify.h"
#include "I_Tasks.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/bcec70dc/lib/ts/Makefile.am
----------------------------------------------------------------------
diff --git a/lib/ts/Makefile.am b/lib/ts/Makefile.am
index 66273fd..dde1643 100644
--- a/lib/ts/Makefile.am
+++ b/lib/ts/Makefile.am
@@ -176,7 +176,6 @@ libtsutil_la_SOURCES = \
ink_thread.h \
ink_time.cc \
ink_time.h \
- libts.h \
llqueue.cc \
lockfile.cc \
signals.cc \
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/bcec70dc/lib/ts/Regression.cc
----------------------------------------------------------------------
diff --git a/lib/ts/Regression.cc b/lib/ts/Regression.cc
index 7cd52c5..503917d 100644
--- a/lib/ts/Regression.cc
+++ b/lib/ts/Regression.cc
@@ -28,7 +28,8 @@
****************************************************************************/
-#include "ts/libts.h"
+#include "ts/ink_platform.h"
+#include "ts/ink_assert.h"
#include "ts/Regression.h"
static RegressionTest *test = NULL;
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/bcec70dc/lib/ts/TestBox.h
----------------------------------------------------------------------
diff --git a/lib/ts/TestBox.h b/lib/ts/TestBox.h
index cee6926..4020fc3 100644
--- a/lib/ts/TestBox.h
+++ b/lib/ts/TestBox.h
@@ -24,7 +24,8 @@
limitations under the License.
*/
-#include <ts/Regression.h>
+#include <stdarg.h>
+#include "ts/Regression.h"
namespace
{
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/bcec70dc/lib/ts/TextBuffer.cc
----------------------------------------------------------------------
diff --git a/lib/ts/TextBuffer.cc b/lib/ts/TextBuffer.cc
index 149baf3..fa80391 100644
--- a/lib/ts/TextBuffer.cc
+++ b/lib/ts/TextBuffer.cc
@@ -21,6 +21,7 @@
limitations under the License.
*/
+#include <stdarg.h>
#include "ts/ink_platform.h"
#include "ts/ink_memory.h"
#include "ts/TextBuffer.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/bcec70dc/lib/ts/X509HostnameValidator.h
----------------------------------------------------------------------
diff --git a/lib/ts/X509HostnameValidator.h b/lib/ts/X509HostnameValidator.h
index 5d9542d..4618c8b 100644
--- a/lib/ts/X509HostnameValidator.h
+++ b/lib/ts/X509HostnameValidator.h
@@ -24,6 +24,8 @@
#ifndef LIB_TS_X509HOSTNAMEVALIDATOR_H_
#define LIB_TS_X509HOSTNAMEVALIDATOR_H_
+#include <openssl/x509.h>
+
/*
* Validate that the certificate is for the specified hostname/IP address
* @param cert The X509 certificate we match against
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/bcec70dc/lib/ts/ink_file.cc
----------------------------------------------------------------------
diff --git a/lib/ts/ink_file.cc b/lib/ts/ink_file.cc
index e095b14..5e69d46 100644
--- a/lib/ts/ink_file.cc
+++ b/lib/ts/ink_file.cc
@@ -21,9 +21,12 @@
limitations under the License.
*/
-#include "ts/libts.h"
#include <unistd.h>
#include <limits.h>
+#include "ts/ink_platform.h"
+#include "ts/ink_file.h"
+#include "ts/ink_string.h"
+#include "ts/ink_memory.h"
#if HAVE_SYS_STAT_H
#include <sys/stat.h>
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/bcec70dc/lib/ts/ink_platform.h
----------------------------------------------------------------------
diff --git a/lib/ts/ink_platform.h b/lib/ts/ink_platform.h
index a67a9ba..75d129a 100644
--- a/lib/ts/ink_platform.h
+++ b/lib/ts/ink_platform.h
@@ -27,8 +27,6 @@
#include "ts/ink_config.h"
-#include <stdio.h>
-#include <stdarg.h>
#ifdef HAVE_STDLIB_H
#include <stdlib.h>
#endif
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/bcec70dc/lib/ts/ink_rand.cc
----------------------------------------------------------------------
diff --git a/lib/ts/ink_rand.cc b/lib/ts/ink_rand.cc
index 5251790..06bd5b4 100644
--- a/lib/ts/ink_rand.cc
+++ b/lib/ts/ink_rand.cc
@@ -55,7 +55,8 @@
*/
-#include "ts/libts.h"
+#include "ts/ink_platform.h"
+#include "ts/ink_rand.h"
#define NN 312
#define MM 156
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/bcec70dc/lib/ts/ink_stack_trace.cc
----------------------------------------------------------------------
diff --git a/lib/ts/ink_stack_trace.cc b/lib/ts/ink_stack_trace.cc
index 1375eaf..e5d157a 100644
--- a/lib/ts/ink_stack_trace.cc
+++ b/lib/ts/ink_stack_trace.cc
@@ -21,8 +21,9 @@
limitations under the License.
*/
-#include "ts/libts.h"
+#include "ts/ink_platform.h"
#include "ts/ink_stack_trace.h"
+#include "ts/ink_args.h"
#include <strings.h>
#include <stdio.h>
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/bcec70dc/lib/ts/ink_syslog.cc
----------------------------------------------------------------------
diff --git a/lib/ts/ink_syslog.cc b/lib/ts/ink_syslog.cc
index ad8b00c..ac3b896 100644
--- a/lib/ts/ink_syslog.cc
+++ b/lib/ts/ink_syslog.cc
@@ -28,7 +28,7 @@
*
*
****************************************************************************/
-#include "ts/libts.h"
+#include "ts/ink_platform.h"
struct syslog_fac {
char *long_str;
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/bcec70dc/lib/ts/ink_thread.cc
----------------------------------------------------------------------
diff --git a/lib/ts/ink_thread.cc b/lib/ts/ink_thread.cc
index 953f2d7..33db2ab 100644
--- a/lib/ts/ink_thread.cc
+++ b/lib/ts/ink_thread.cc
@@ -30,6 +30,7 @@
#include "ts/ink_platform.h"
#include "ts/ink_thread.h"
+#include "ts/ink_atomic.h"
// // ignore the compiler warning... so that this can be used
// // in the face of changes to the Solaris header files (see "man thread")
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/bcec70dc/mgmt/BaseManager.h
----------------------------------------------------------------------
diff --git a/mgmt/BaseManager.h b/mgmt/BaseManager.h
index dbaca14..c2ece05 100644
--- a/mgmt/BaseManager.h
+++ b/mgmt/BaseManager.h
@@ -37,6 +37,7 @@
#include "ts/ink_thread.h"
#include "ts/ink_mutex.h"
#include "ts/ink_llqueue.h"
+#include "ts/ink_hash_table.h"
#include "MgmtDefs.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/bcec70dc/mgmt/FileManager.cc
----------------------------------------------------------------------
diff --git a/mgmt/FileManager.cc b/mgmt/FileManager.cc
index 963687e..e2d1c90 100644
--- a/mgmt/FileManager.cc
+++ b/mgmt/FileManager.cc
@@ -21,7 +21,8 @@
limitations under the License.
*/
-#include "ts/libts.h"
+#include "ts/ink_platform.h"
+#include "ts/ink_file.h"
#include "ts/I_Layout.h"
#include "FileManager.h"
#include "Main.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/bcec70dc/mgmt/ProxyConfig.cc
----------------------------------------------------------------------
diff --git a/mgmt/ProxyConfig.cc b/mgmt/ProxyConfig.cc
index 13af7f8..ca6273d 100644
--- a/mgmt/ProxyConfig.cc
+++ b/mgmt/ProxyConfig.cc
@@ -21,7 +21,7 @@
limitations under the License.
*/
-#include "ts/libts.h"
+#include "ts/ink_platform.h"
#include "ProxyConfig.h"
#include "P_EventSystem.h"
#include "ts/TestBox.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/bcec70dc/mgmt/WebMgmtUtils.cc
----------------------------------------------------------------------
diff --git a/mgmt/WebMgmtUtils.cc b/mgmt/WebMgmtUtils.cc
index 0d97307..e0c817b 100644
--- a/mgmt/WebMgmtUtils.cc
+++ b/mgmt/WebMgmtUtils.cc
@@ -21,7 +21,11 @@
limitations under the License.
*/
-#include "ts/libts.h"
+#include "ts/ink_platform.h"
+#include "ts/ink_string.h"
+#include "ts/Tokenizer.h"
+#include "ts/ink_code.h"
+#include "ts/ink_file.h"
#include "LocalManager.h"
#include "MgmtUtils.h"
#include "WebMgmtUtils.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/bcec70dc/mgmt/api/EventControlMain.cc
----------------------------------------------------------------------
diff --git a/mgmt/api/EventControlMain.cc b/mgmt/api/EventControlMain.cc
index c7a87bc..c26855f 100644
--- a/mgmt/api/EventControlMain.cc
+++ b/mgmt/api/EventControlMain.cc
@@ -29,7 +29,8 @@
*
***************************************************************************/
-#include "ts/libts.h"
+#include "ts/ink_platform.h"
+#include "ts/ink_sock.h"
#include "LocalManager.h"
#include "MgmtSocket.h"
#include "MgmtMarshall.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/bcec70dc/mgmt/api/INKMgmtAPI.cc
----------------------------------------------------------------------
diff --git a/mgmt/api/INKMgmtAPI.cc b/mgmt/api/INKMgmtAPI.cc
index 4d56070..ad78811 100644
--- a/mgmt/api/INKMgmtAPI.cc
+++ b/mgmt/api/INKMgmtAPI.cc
@@ -29,7 +29,9 @@
*
*
***************************************************************************/
-#include "ts/libts.h"
+#include "ts/ink_platform.h"
+#include "ts/ink_code.h"
+#include "ts/ParseRules.h"
#include <limits.h>
#include "ts/I_Layout.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/bcec70dc/mgmt/cluster/ClusterCom.cc
----------------------------------------------------------------------
diff --git a/mgmt/cluster/ClusterCom.cc b/mgmt/cluster/ClusterCom.cc
index 2c814a9..45055ff 100644
--- a/mgmt/cluster/ClusterCom.cc
+++ b/mgmt/cluster/ClusterCom.cc
@@ -31,7 +31,9 @@
*
*/
-#include "ts/libts.h"
+#include "ts/ink_platform.h"
+#include "ts/ink_sock.h"
+#include "ts/ink_file.h"
#include "ts/I_Version.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/bcec70dc/proxy/CacheControl.h
----------------------------------------------------------------------
diff --git a/proxy/CacheControl.h b/proxy/CacheControl.h
index de3820c..059c546 100644
--- a/proxy/CacheControl.h
+++ b/proxy/CacheControl.h
@@ -34,6 +34,7 @@
#include "Main.h"
#include "P_EventSystem.h"
#include "ControlBase.h"
+#include "ts/MatcherUtils.h"
struct RequestData;
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/bcec70dc/proxy/ControlMatcher.cc
----------------------------------------------------------------------
diff --git a/proxy/ControlMatcher.cc b/proxy/ControlMatcher.cc
index 5d13a7d..75c101c 100644
--- a/proxy/ControlMatcher.cc
+++ b/proxy/ControlMatcher.cc
@@ -32,6 +32,7 @@
#include "ts/ink_config.h"
#include "ts/MatcherUtils.h"
+#include "ts/Tokenizer.h"
#include "Main.h"
#include "ProxyConfig.h"
#include "ControlMatcher.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/bcec70dc/proxy/ControlMatcher.h
----------------------------------------------------------------------
diff --git a/proxy/ControlMatcher.h b/proxy/ControlMatcher.h
index 57562a8..5c1158d 100644
--- a/proxy/ControlMatcher.h
+++ b/proxy/ControlMatcher.h
@@ -90,6 +90,7 @@
#include "ts/DynArray.h"
#include "ts/ink_hash_table.h"
#include "ts/IpMap.h"
+#include "ts/MatcherUtils.h"
#include "ts/ink_apidefs.h"
#include "ts/ink_defs.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/bcec70dc/proxy/ICPConfig.cc
----------------------------------------------------------------------
diff --git a/proxy/ICPConfig.cc b/proxy/ICPConfig.cc
index e6ed78b..c642e0c 100644
--- a/proxy/ICPConfig.cc
+++ b/proxy/ICPConfig.cc
@@ -29,6 +29,7 @@
****************************************************************************/
#include "ts/ink_platform.h"
+#include "ts/ink_file.h"
#include "P_EventSystem.h"
#include "P_Cache.h"
#include "P_Net.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/bcec70dc/proxy/InkAPI.cc
----------------------------------------------------------------------
diff --git a/proxy/InkAPI.cc b/proxy/InkAPI.cc
index 5e3c0f8..445e2ce 100644
--- a/proxy/InkAPI.cc
+++ b/proxy/InkAPI.cc
@@ -24,6 +24,7 @@
#include <stdio.h>
#include "ts/ink_platform.h"
+#include "ts/ink_base64.h"
#include "ts/I_Layout.h"
#include "ts.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/bcec70dc/proxy/InkAPITest.cc
----------------------------------------------------------------------
diff --git a/proxy/InkAPITest.cc b/proxy/InkAPITest.cc
index fcf2997..4a43fa6 100644
--- a/proxy/InkAPITest.cc
+++ b/proxy/InkAPITest.cc
@@ -28,6 +28,8 @@
#endif
#include "ts/ink_config.h"
+#include "ts/ink_sprintf.h"
+#include "ts/ink_file.h"
#include <sys/types.h>
#include <errno.h>
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/bcec70dc/proxy/Main.cc
----------------------------------------------------------------------
diff --git a/proxy/Main.cc b/proxy/Main.cc
index 0f402dd..c517af3 100644
--- a/proxy/Main.cc
+++ b/proxy/Main.cc
@@ -30,10 +30,14 @@
****************************************************************************/
-#include "ts/ink_config.h"
-
#include "ts/ink_platform.h"
#include "ts/ink_sys_control.h"
+#include "ts/ink_args.h"
+#include "ts/ink_lockfile.h"
+#include "ts/ink_stack_trace.h"
+#include "ts/ink_syslog.h"
+#include "ts/hugepages.h"
+
#include <syslog.h>
#if !defined(linux)
@@ -89,7 +93,6 @@ extern "C" int plock(int);
#include "I_Tasks.h"
#include "InkAPIInternal.h"
#include "HTTP2.h"
-#include "ts/ink_config.h"
#include <ts/ink_cap.h>
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/bcec70dc/proxy/ParentSelection.cc
----------------------------------------------------------------------
diff --git a/proxy/ParentSelection.cc b/proxy/ParentSelection.cc
index b8e432c..9000982 100644
--- a/proxy/ParentSelection.cc
+++ b/proxy/ParentSelection.cc
@@ -21,6 +21,8 @@
limitations under the License.
*/
#include "ts/ink_platform.h"
+#include "ts/HashSip.h"
+#include "ts/Tokenizer.h"
#include "P_EventSystem.h"
#include "ParentSelection.h"
#include "ControlMatcher.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/bcec70dc/proxy/ParentSelection.h
----------------------------------------------------------------------
diff --git a/proxy/ParentSelection.h b/proxy/ParentSelection.h
index e25b38e..a74b659 100644
--- a/proxy/ParentSelection.h
+++ b/proxy/ParentSelection.h
@@ -36,11 +36,10 @@
#include "ControlBase.h"
#include "ControlMatcher.h"
-#include "ts/ink_apidefs.h"
-
#include "P_RecProcess.h"
#include "ts/ink_platform.h"
+#include "ts/ConsistentHash.h"
#define MAX_PARENTS 64
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/bcec70dc/proxy/RegressionSM.h
----------------------------------------------------------------------
diff --git a/proxy/RegressionSM.h b/proxy/RegressionSM.h
index 3295969..08399d2 100644
--- a/proxy/RegressionSM.h
+++ b/proxy/RegressionSM.h
@@ -25,6 +25,8 @@
#define _RegressionSM_h
#include "I_EventSystem.h"
+#include "ts/Regression.h"
+#include "ts/DynArray.h"
/*
Regression Test Composition State Machine
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/bcec70dc/proxy/http/HttpBodyFactory.cc
----------------------------------------------------------------------
diff --git a/proxy/http/HttpBodyFactory.cc b/proxy/http/HttpBodyFactory.cc
index 0d01139..51a3e8f 100644
--- a/proxy/http/HttpBodyFactory.cc
+++ b/proxy/http/HttpBodyFactory.cc
@@ -29,6 +29,8 @@
****************************************************************************/
#include "ts/ink_platform.h"
+#include "ts/ink_sprintf.h"
+#include "ts/ink_file.h"
#include "HttpBodyFactory.h"
#include <unistd.h>
#include <dirent.h>
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/bcec70dc/proxy/http/HttpClientSession.h
----------------------------------------------------------------------
diff --git a/proxy/http/HttpClientSession.h b/proxy/http/HttpClientSession.h
index 6f4c885..5c5ae53 100644
--- a/proxy/http/HttpClientSession.h
+++ b/proxy/http/HttpClientSession.h
@@ -33,6 +33,7 @@
#define _HTTP_CLIENT_SESSION_H_
#include "ts/ink_platform.h"
+#include "ts/ink_resolver.h"
#include "P_Net.h"
#include "InkAPIInternal.h"
#include "HTTP.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/bcec70dc/proxy/http/HttpConfig.h
----------------------------------------------------------------------
diff --git a/proxy/http/HttpConfig.h b/proxy/http/HttpConfig.h
index 085136c..cd2cb75 100644
--- a/proxy/http/HttpConfig.h
+++ b/proxy/http/HttpConfig.h
@@ -42,6 +42,7 @@
#endif
#include "ts/ink_platform.h"
+#include "ts/ink_inet.h"
#include "ts/Regex.h"
#include "HttpProxyAPIEnums.h"
#include "ProxyConfig.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/bcec70dc/proxy/http/HttpPages.h
----------------------------------------------------------------------
diff --git a/proxy/http/HttpPages.h b/proxy/http/HttpPages.h
index f009111..de43487 100644
--- a/proxy/http/HttpPages.h
+++ b/proxy/http/HttpPages.h
@@ -34,7 +34,7 @@
#ifndef _HTTP_PAGES_H_
#define _HTTP_PAGES_H_
-#include "ts/libts.h"
+#include "ts/ink_platform.h"
#include "P_EventSystem.h"
#include "ts/DynArray.h"
#include "HTTP.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/bcec70dc/proxy/http/remap/RemapConfig.cc
----------------------------------------------------------------------
diff --git a/proxy/http/remap/RemapConfig.cc b/proxy/http/remap/RemapConfig.cc
index 7152b6e..2013009 100644
--- a/proxy/http/remap/RemapConfig.cc
+++ b/proxy/http/remap/RemapConfig.cc
@@ -30,6 +30,7 @@
#include "ts/List.h"
#include "ts/ink_cap.h"
#include "ts/ink_file.h"
+#include "ts/Tokenizer.h"
#define modulePrefix "[ReverseProxy]"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/bcec70dc/proxy/http2/Http2ClientSession.cc
----------------------------------------------------------------------
diff --git a/proxy/http2/Http2ClientSession.cc b/proxy/http2/Http2ClientSession.cc
index b0a130a..4e3b85e 100644
--- a/proxy/http2/Http2ClientSession.cc
+++ b/proxy/http2/Http2ClientSession.cc
@@ -23,6 +23,7 @@
#include "Http2ClientSession.h"
#include "HttpDebugNames.h"
+#include "ts/ink_base64.h"
#define STATE_ENTER(state_name, event) \
do { \
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/bcec70dc/proxy/logcat.cc
----------------------------------------------------------------------
diff --git a/proxy/logcat.cc b/proxy/logcat.cc
index 3113b5d..3fe50fe 100644
--- a/proxy/logcat.cc
+++ b/proxy/logcat.cc
@@ -21,7 +21,8 @@
limitations under the License.
*/
-#include "ts/libts.h"
+#include "ts/ink_platform.h"
+#include "ts/ink_args.h"
#include "ts/I_Layout.h"
#define PROGRAM_NAME "traffic_logcat"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/bcec70dc/proxy/logging/Log.h
----------------------------------------------------------------------
diff --git a/proxy/logging/Log.h b/proxy/logging/Log.h
index 672ac2e..814b277 100644
--- a/proxy/logging/Log.h
+++ b/proxy/logging/Log.h
@@ -295,6 +295,9 @@
#include <stdarg.h>
#include "ts/ink_platform.h"
+#include "ts/EventNotify.h"
+#include "ts/ink_hash_table.h"
+#include "ts/Regression.h"
#include "P_RecProcess.h"
#include "LogFile.h"
#include "LogBuffer.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/bcec70dc/proxy/logging/LogFile.cc
----------------------------------------------------------------------
diff --git a/proxy/logging/LogFile.cc b/proxy/logging/LogFile.cc
index 8253d16..bf8ef3e 100644
--- a/proxy/logging/LogFile.cc
+++ b/proxy/logging/LogFile.cc
@@ -28,6 +28,8 @@
***************************************************************************/
#include "ts/ink_platform.h"
+#include "ts/SimpleTokenizer.h"
+#include "ts/ink_file.h"
#include <errno.h>
#include <sys/types.h>
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/bcec70dc/proxy/logging/LogObject.cc
----------------------------------------------------------------------
diff --git a/proxy/logging/LogObject.cc b/proxy/logging/LogObject.cc
index 7311773..640ba45 100644
--- a/proxy/logging/LogObject.cc
+++ b/proxy/logging/LogObject.cc
@@ -27,8 +27,8 @@
***************************************************************************/
#include "ts/ink_platform.h"
-
-
+#include "ts/CryptoHash.h"
+#include "ts/INK_MD5.h"
#include "Error.h"
#include "P_EventSystem.h"
#include "LogUtils.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/bcec70dc/proxy/logging/LogSock.cc
----------------------------------------------------------------------
diff --git a/proxy/logging/LogSock.cc b/proxy/logging/LogSock.cc
index 87ca857..ed431e4 100644
--- a/proxy/logging/LogSock.cc
+++ b/proxy/logging/LogSock.cc
@@ -21,6 +21,8 @@
limitations under the License.
*/
+#include "ts/ink_inet.h"
+#include "ts/ink_string.h"
#include "P_EventSystem.h"
#include "Error.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/bcec70dc/proxy/logging/LogStandalone.cc
----------------------------------------------------------------------
diff --git a/proxy/logging/LogStandalone.cc b/proxy/logging/LogStandalone.cc
index de289a3..cfefdf4 100644
--- a/proxy/logging/LogStandalone.cc
+++ b/proxy/logging/LogStandalone.cc
@@ -28,6 +28,7 @@
***************************************************************************/
#include "ts/ink_platform.h"
+#include "ts/ink_lockfile.h"
#include "ts/ink_sys_control.h"
#include "ts/signals.h"
#include "DiagsConfig.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/bcec70dc/proxy/logging/LogUtils.cc
----------------------------------------------------------------------
diff --git a/proxy/logging/LogUtils.cc b/proxy/logging/LogUtils.cc
index 1aac724..fedae07 100644
--- a/proxy/logging/LogUtils.cc
+++ b/proxy/logging/LogUtils.cc
@@ -22,6 +22,7 @@
limitations under the License.
*/
#include "ts/ink_config.h"
+#include "ts/ink_string.h"
#include <assert.h>
#include <stdio.h>
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/bcec70dc/proxy/logstats.cc
----------------------------------------------------------------------
diff --git a/proxy/logstats.cc b/proxy/logstats.cc
index 7143835..4922e15 100644
--- a/proxy/logstats.cc
+++ b/proxy/logstats.cc
@@ -22,10 +22,12 @@
*/
#include "ts/ink_platform.h"
-#include "ts/ink_config.h"
#include "ts/ink_file.h"
#include "ts/I_Layout.h"
#include "ts/I_Version.h"
+#include "ts/HashFNV.h"
+#include "ts/ink_args.h"
+#include "ts/MatcherUtils.h"
// Includes and namespaces etc.
#include "LogStandalone.cc"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/bcec70dc/proxy/sac.cc
----------------------------------------------------------------------
diff --git a/proxy/sac.cc b/proxy/sac.cc
index 3c20573..acfac2b 100644
--- a/proxy/sac.cc
+++ b/proxy/sac.cc
@@ -22,6 +22,7 @@
*/
#include "ts/ink_platform.h"
+#include "ts/ink_args.h"
#include "ts/I_Layout.h"
#include "P_Net.h"
[6/7] trafficserver git commit: TS-3759 Eliminate -Ilib/ts
Posted by zw...@apache.org.
TS-3759 Eliminate -Ilib/ts
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/23ce6934
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/23ce6934
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/23ce6934
Branch: refs/heads/master
Commit: 23ce6934e4a6ab3d261581e10d7d6d344f424b0d
Parents: a7a9570
Author: Leif Hedstrom <zw...@apache.org>
Authored: Fri Jul 10 15:00:25 2015 -0600
Committer: Leif Hedstrom <zw...@apache.org>
Committed: Thu Jul 16 14:25:32 2015 -0600
----------------------------------------------------------------------
build/plugins.mk | 1 -
cmd/traffic_cop/Makefile.am | 2 --
cmd/traffic_cop/traffic_cop.cc | 8 ++++----
cmd/traffic_crashlog/Makefile.am | 2 --
cmd/traffic_crashlog/traffic_crashlog.cc | 8 ++++----
cmd/traffic_crashlog/traffic_crashlog.h | 2 +-
cmd/traffic_ctl/Makefile.am | 2 --
cmd/traffic_ctl/traffic_ctl.h | 6 +++---
cmd/traffic_layout/Makefile.am | 2 --
cmd/traffic_layout/traffic_layout.cc | 10 +++++-----
cmd/traffic_line/Makefile.am | 2 --
cmd/traffic_line/traffic_line.cc | 10 +++++-----
cmd/traffic_manager/AddConfigFilesHere.cc | 4 ++--
cmd/traffic_manager/Makefile.am | 5 +----
cmd/traffic_manager/MgmtHandlers.cc | 4 ++--
cmd/traffic_manager/StatProcessor.cc | 2 +-
cmd/traffic_manager/StatProcessor.h | 4 ++--
cmd/traffic_manager/StatType.cc | 6 +++---
cmd/traffic_manager/StatXML.cc | 2 +-
cmd/traffic_manager/StatXML.h | 2 +-
cmd/traffic_manager/WebOverview.cc | 4 ++--
cmd/traffic_manager/WebOverview.h | 8 ++++----
cmd/traffic_manager/traffic_manager.cc | 8 ++++----
cmd/traffic_top/Makefile.am | 2 --
cmd/traffic_top/traffic_top.cc | 2 +-
cmd/traffic_via/Makefile.am | 2 --
cmd/traffic_via/traffic_via.cc | 12 ++++++------
cmd/traffic_wccp/Makefile.am | 1 -
cmd/traffic_wccp/wccp_client.cc | 4 ++--
example/session-1/session-1.c | 2 +-
iocore/aio/I_AIO.h | 2 +-
iocore/aio/Makefile.am | 4 +---
iocore/aio/test_AIO.cc | 2 +-
iocore/cache/Cache.cc | 4 ++--
iocore/cache/CacheDir.cc | 4 ++--
iocore/cache/CacheHosting.cc | 2 +-
iocore/cache/CacheHttp.cc | 2 +-
iocore/cache/I_Cache.h | 2 +-
iocore/cache/I_Store.h | 2 +-
iocore/cache/Makefile.am | 2 --
iocore/cache/P_Cache.h | 4 ++--
iocore/cache/P_CacheInternal.h | 2 +-
iocore/cache/Store.cc | 4 ++--
iocore/cluster/ClusterMachine.cc | 4 ++--
iocore/cluster/Makefile.am | 2 --
iocore/cluster/P_Cluster.h | 2 +-
iocore/dns/Makefile.am | 2 --
iocore/dns/P_DNS.h | 2 +-
iocore/dns/P_DNSProcessor.h | 2 +-
iocore/dns/SRV.h | 2 +-
iocore/dns/SplitDNS.cc | 6 +++---
iocore/eventsystem/IOBuffer.cc | 2 +-
iocore/eventsystem/I_Action.h | 2 +-
iocore/eventsystem/I_Continuation.h | 2 +-
iocore/eventsystem/I_EThread.h | 2 +-
iocore/eventsystem/I_Event.h | 2 +-
iocore/eventsystem/I_EventProcessor.h | 2 +-
iocore/eventsystem/I_EventSystem.h | 2 +-
iocore/eventsystem/I_IOBuffer.h | 4 ++--
iocore/eventsystem/I_Lock.h | 2 +-
iocore/eventsystem/I_PriorityEventQueue.h | 2 +-
iocore/eventsystem/I_Processor.h | 2 +-
iocore/eventsystem/I_ProtectedQueue.h | 2 +-
iocore/eventsystem/I_ProxyAllocator.h | 2 +-
iocore/eventsystem/I_SocketManager.h | 2 +-
iocore/eventsystem/I_Thread.h | 2 +-
iocore/eventsystem/I_VConnection.h | 2 +-
iocore/eventsystem/I_VIO.h | 4 ++--
iocore/eventsystem/Lock.cc | 2 +-
iocore/eventsystem/Makefile.am | 4 +---
iocore/eventsystem/P_EventSystem.h | 2 +-
iocore/eventsystem/P_Freer.h | 2 +-
iocore/eventsystem/P_IOBuffer.h | 4 ++--
iocore/eventsystem/P_UnixSocketManager.h | 2 +-
iocore/eventsystem/SocketManager.cc | 2 +-
iocore/eventsystem/UnixEventProcessor.cc | 2 +-
iocore/eventsystem/test_Buffer.cc | 2 +-
iocore/eventsystem/test_Event.cc | 2 +-
iocore/hostdb/HostDB.cc | 4 ++--
iocore/hostdb/Makefile.am | 2 --
iocore/hostdb/MultiCache.cc | 6 +++---
iocore/hostdb/P_HostDB.h | 2 +-
iocore/net/Connection.cc | 2 +-
iocore/net/I_Net.h | 2 +-
iocore/net/I_NetVConnection.h | 2 +-
iocore/net/I_UDPNet.h | 4 ++--
iocore/net/Makefile.am | 2 --
iocore/net/P_Connection.h | 2 +-
iocore/net/P_Net.h | 2 +-
iocore/net/P_NetAccept.h | 2 +-
iocore/net/P_NetVCTest.h | 2 +-
iocore/net/P_SSLClientUtils.h | 4 ++--
iocore/net/P_SSLNetAccept.h | 2 +-
iocore/net/P_SSLNetProcessor.h | 2 +-
iocore/net/P_SSLNetVConnection.h | 4 ++--
iocore/net/P_SSLNextProtocolSet.h | 2 +-
iocore/net/P_SSLUtils.h | 4 ++--
iocore/net/P_UnixNet.h | 2 +-
iocore/net/P_UnixNetState.h | 2 +-
iocore/net/P_UnixNetVConnection.h | 2 +-
iocore/net/P_UnixPollDescriptor.h | 2 +-
iocore/net/SSLCertLookup.cc | 8 ++++----
iocore/net/SSLClientUtils.cc | 4 ++--
iocore/net/SSLConfig.cc | 4 ++--
iocore/net/SSLDynlock.cc | 2 +-
iocore/net/SSLInternal.cc | 2 +-
iocore/net/SSLNetAccept.cc | 2 +-
iocore/net/SSLNetProcessor.cc | 4 ++--
iocore/net/SSLNetVConnection.cc | 2 +-
iocore/net/SSLNextProtocolSet.cc | 6 +++---
iocore/net/SSLSessionCache.h | 10 +++++-----
iocore/net/SSLUtils.cc | 8 ++++----
iocore/net/Socks.cc | 2 +-
iocore/net/UnixNetPages.cc | 2 +-
iocore/net/UnixNetVConnection.cc | 2 +-
iocore/net/test_I_UDPNet.cc | 2 +-
iocore/net/test_P_UDPNet.cc | 2 +-
iocore/utils/Machine.cc | 2 +-
iocore/utils/Makefile.am | 2 --
lib/atscppapi/src/Makefile.am | 8 ++++----
lib/atscppapi/src/Transaction.cc | 2 +-
lib/records/I_RecCore.h | 2 +-
lib/records/I_RecDefs.h | 4 ++--
lib/records/I_RecMutex.h | 4 ++--
lib/records/Makefile.am | 4 +---
lib/records/P_RecCore.cc | 10 +++++-----
lib/records/P_RecCore.h | 10 +++++-----
lib/records/P_RecUtils.h | 4 ++--
lib/records/RecConfigParse.cc | 12 ++++++------
lib/records/RecCore.cc | 4 ++--
lib/records/RecFile.cc | 2 +-
lib/records/RecLocal.cc | 4 ++--
lib/records/RecMessage.cc | 4 ++--
lib/records/RecMutex.cc | 2 +-
lib/records/RecProcess.cc | 2 +-
lib/records/RecUtils.cc | 2 +-
lib/records/test_RecProcess.i | 2 +-
lib/ts/Arena.cc | 4 ++--
lib/ts/Bitops.cc | 2 +-
lib/ts/CompileParseRules.cc | 4 ++--
lib/ts/ConsistentHash.cc | 2 +-
lib/ts/Diags.cc | 16 ++++++++--------
lib/ts/EventNotify.cc | 6 +++---
lib/ts/Hash.cc | 2 +-
lib/ts/HashFNV.cc | 2 +-
lib/ts/HashMD5.cc | 2 +-
lib/ts/HashSip.cc | 2 +-
lib/ts/HostLookup.cc | 6 +++---
lib/ts/IpMap.cc | 2 +-
lib/ts/Layout.cc | 4 ++--
lib/ts/MMH.cc | 6 +++---
lib/ts/MatcherUtils.cc | 2 +-
lib/ts/MatcherUtils.h | 2 +-
lib/ts/MimeTable.cc | 2 +-
lib/ts/ParseRules.cc | 2 +-
lib/ts/RawHashTable.cc | 2 +-
lib/ts/RbTree.cc | 2 +-
lib/ts/Regex.cc | 4 ++--
lib/ts/Regression.cc | 4 ++--
lib/ts/Regression.h | 4 ++--
lib/ts/TestHttpHeader.cc | 2 +-
lib/ts/TextBuffer.cc | 4 ++--
lib/ts/Tokenizer.cc | 10 +++++-----
lib/ts/Vec.cc | 2 +-
lib/ts/Vec.h | 2 +-
lib/ts/Version.cc | 2 +-
lib/ts/X509HostnameValidator.cc | 2 +-
lib/ts/hugepages.cc | 4 ++--
lib/ts/ink_args.cc | 2 +-
lib/ts/ink_assert.cc | 8 ++++----
lib/ts/ink_auth_api.cc | 6 +++---
lib/ts/ink_base64.cc | 4 ++--
lib/ts/ink_cap.cc | 8 ++++----
lib/ts/ink_code.cc | 8 ++++----
lib/ts/ink_defs.cc | 4 ++--
lib/ts/ink_error.cc | 6 +++---
lib/ts/ink_file.cc | 2 +-
lib/ts/ink_hash_table.cc | 6 +++---
lib/ts/ink_hrtime.cc | 6 +++---
lib/ts/ink_inet.cc | 2 +-
lib/ts/ink_memory.cc | 2 +-
lib/ts/ink_mutex.cc | 6 +++---
lib/ts/ink_queue.cc | 16 ++++++++--------
lib/ts/ink_queue_utils.cc | 6 +++---
lib/ts/ink_rand.cc | 2 +-
lib/ts/ink_res_init.cc | 12 ++++++------
lib/ts/ink_res_mkquery.cc | 8 ++++----
lib/ts/ink_resource.cc | 6 +++---
lib/ts/ink_rwlock.cc | 4 ++--
lib/ts/ink_sock.cc | 2 +-
lib/ts/ink_sprintf.cc | 2 +-
lib/ts/ink_stack_trace.cc | 4 ++--
lib/ts/ink_string++.cc | 2 +-
lib/ts/ink_string.cc | 2 +-
lib/ts/ink_sys_control.cc | 6 +++---
lib/ts/ink_syslog.cc | 2 +-
lib/ts/ink_thread.cc | 2 +-
lib/ts/ink_time.cc | 10 +++++-----
lib/ts/libts.h | 2 +-
lib/ts/llqueue.cc | 6 +++---
lib/ts/load_http_hdr.cc | 2 +-
lib/ts/lockfile.cc | 4 ++--
lib/ts/signals.cc | 6 +++---
lib/ts/test_Map.cc | 2 +-
lib/ts/test_Vec.cc | 4 ++--
lib/ts/test_arena.cc | 2 +-
lib/ts/test_freelist.cc | 4 ++--
lib/tsconfig/Makefile.am | 4 +---
lib/wccp/Makefile.am | 1 -
lib/wccp/Wccp.h | 4 ++--
lib/wccp/WccpEndPoint.cc | 4 ++--
lib/wccp/WccpMsg.cc | 4 ++--
lib/wccp/WccpStatic.cc | 4 ++--
mgmt/Alarms.cc | 4 ++--
mgmt/Alarms.h | 4 ++--
mgmt/BaseManager.cc | 2 +-
mgmt/BaseManager.h | 6 +++---
mgmt/FileManager.cc | 4 ++--
mgmt/FileManager.h | 4 ++--
mgmt/LocalManager.cc | 8 ++++----
mgmt/Makefile.am | 2 --
mgmt/MgmtDefs.h | 4 ++--
mgmt/MultiFile.cc | 18 +++++++++---------
mgmt/ProcessManager.cc | 6 +++---
mgmt/ProcessManager.h | 4 ++--
mgmt/ProxyConfig.cc | 2 +-
mgmt/ProxyConfig.h | 2 +-
mgmt/RecordsConfig.cc | 2 +-
mgmt/RecordsConfigUtils.cc | 4 ++--
mgmt/Rollback.cc | 6 +++---
mgmt/Rollback.h | 10 +++++-----
mgmt/WebMgmtUtils.cc | 4 ++--
mgmt/WebMgmtUtils.h | 4 ++--
mgmt/api/APITestCliRemote.cc | 6 +++---
mgmt/api/CfgContextDefs.h | 2 +-
mgmt/api/CfgContextImpl.cc | 4 ++--
mgmt/api/CfgContextImpl.h | 2 +-
mgmt/api/CfgContextManager.cc | 4 ++--
mgmt/api/CfgContextUtils.cc | 6 +++---
mgmt/api/CoreAPI.cc | 10 +++++-----
mgmt/api/CoreAPI.h | 4 ++--
mgmt/api/CoreAPIRemote.cc | 10 +++++-----
mgmt/api/CoreAPIShared.cc | 2 +-
mgmt/api/EventCallback.cc | 4 ++--
mgmt/api/EventCallback.h | 2 +-
mgmt/api/EventControlMain.cc | 2 +-
mgmt/api/GenericParser.cc | 2 +-
mgmt/api/GenericParser.h | 6 +++---
mgmt/api/INKMgmtAPI.cc | 6 +++---
mgmt/api/Makefile.am | 2 --
mgmt/api/NetworkMessage.cc | 8 ++++----
mgmt/api/NetworkUtilsLocal.cc | 6 +++---
mgmt/api/NetworkUtilsLocal.h | 2 +-
mgmt/api/NetworkUtilsRemote.cc | 12 ++++++------
mgmt/api/TSControlMain.cc | 2 +-
mgmt/cluster/ClusterCom.cc | 6 +++---
mgmt/cluster/ClusterCom.h | 4 ++--
mgmt/cluster/Makefile.am | 2 --
mgmt/cluster/VMap.cc | 4 ++--
mgmt/cluster/VMap.h | 2 +-
mgmt/utils/ExpandingArray.cc | 4 ++--
mgmt/utils/Makefile.am | 2 --
mgmt/utils/MgmtHashTable.h | 6 +++---
mgmt/utils/MgmtMarshall.cc | 2 +-
mgmt/utils/MgmtSocket.cc | 2 +-
mgmt/utils/MgmtSocket.h | 2 +-
mgmt/utils/MgmtUtils.cc | 4 ++--
mgmt/utils/MgmtUtils.h | 4 ++--
mgmt/utils/test_marshall.cc | 6 +++---
plugins/experimental/ats_pagespeed/gzip/gzip.cc | 2 +-
plugins/experimental/ats_pagespeed/gzip/misc.cc | 2 +-
.../experimental/channel_stats/channel_stats.cc | 4 ++--
plugins/experimental/channel_stats/debug_macros.h | 2 +-
proxy/AbstractBuffer.cc | 4 ++--
proxy/AbstractBuffer.h | 2 +-
proxy/CacheControl.cc | 4 ++--
proxy/ControlBase.cc | 12 ++++++------
proxy/ControlBase.h | 2 +-
proxy/ControlMatcher.cc | 4 ++--
proxy/ControlMatcher.h | 8 ++++----
proxy/CoreUtils.cc | 4 ++--
proxy/CoreUtils.h | 2 +-
proxy/Crash.cc | 6 +++---
proxy/EventName.cc | 2 +-
proxy/FetchSM.cc | 2 +-
proxy/ICP.cc | 2 +-
proxy/ICP.h | 2 +-
proxy/ICPConfig.cc | 4 ++--
proxy/IPAllow.cc | 2 +-
proxy/InkAPI.cc | 4 ++--
proxy/InkAPIInternal.h | 2 +-
proxy/InkAPITest.cc | 4 ++--
proxy/InkAPITestTool.cc | 2 +-
proxy/InkIOCoreAPI.cc | 2 +-
proxy/InkPool_r.h | 2 +-
proxy/Main.cc | 10 +++++-----
proxy/Main.h | 6 +++---
proxy/Makefile.am | 2 --
proxy/ParentSelection.cc | 2 +-
proxy/ParentSelection.h | 4 ++--
proxy/Plugin.cc | 10 +++++-----
proxy/Plugin.h | 2 +-
proxy/PluginVC.cc | 2 +-
proxy/PluginVC.h | 2 +-
proxy/ProxyClientSession.h | 2 +-
proxy/ReverseProxy.cc | 6 +++---
proxy/ReverseProxy.h | 4 ++--
proxy/SocksProxy.cc | 2 +-
proxy/StatPages.cc | 4 ++--
proxy/StatSystem.cc | 2 +-
proxy/StatSystem.h | 10 +++++-----
proxy/TestClock.cc | 2 +-
proxy/TestClusterHash.cc | 2 +-
proxy/TestDNS.cc | 2 +-
proxy/TestPreProc.cc | 4 ++--
proxy/TestRegex.cc | 2 +-
proxy/Transform.cc | 2 +-
proxy/congest/Congestion.cc | 2 +-
proxy/congest/Congestion.h | 2 +-
proxy/congest/CongestionDB.cc | 2 +-
proxy/congest/CongestionTest.cc | 2 +-
proxy/congest/Makefile.am | 2 --
proxy/hdrs/HTTP.cc | 6 +++---
proxy/hdrs/HTTP.h | 6 +++---
proxy/hdrs/HdrHeap.cc | 2 +-
proxy/hdrs/HdrHeap.h | 8 ++++----
proxy/hdrs/HdrTSOnly.cc | 2 +-
proxy/hdrs/HdrTest.cc | 6 +++---
proxy/hdrs/HdrTest.h | 2 +-
proxy/hdrs/HdrToken.cc | 6 +++---
proxy/hdrs/HdrToken.h | 14 +++++++-------
proxy/hdrs/HdrUtils.cc | 2 +-
proxy/hdrs/HdrUtils.h | 2 +-
proxy/hdrs/HttpCompat.cc | 2 +-
proxy/hdrs/HttpCompat.h | 6 +++---
proxy/hdrs/MIME.cc | 4 ++--
proxy/hdrs/MIME.h | 6 +++---
proxy/hdrs/Makefile.am | 4 +---
proxy/hdrs/URL.cc | 4 ++--
proxy/hdrs/URL.h | 8 ++++----
proxy/hdrs/load_http_hdr.cc | 4 ++--
proxy/hdrs/test_header.cc | 4 ++--
proxy/hdrs/test_urlhash.cc | 4 ++--
proxy/http/HttpBodyFactory.cc | 4 ++--
proxy/http/HttpBodyFactory.h | 4 ++--
proxy/http/HttpClientSession.cc | 4 ++--
proxy/http/HttpClientSession.h | 2 +-
proxy/http/HttpConfig.cc | 2 +-
proxy/http/HttpConfig.h | 4 ++--
proxy/http/HttpConnectionCount.h | 4 ++--
proxy/http/HttpPages.h | 4 ++--
proxy/http/HttpProxyServerMain.cc | 4 ++--
proxy/http/HttpSM.h | 2 +-
proxy/http/HttpServerSession.cc | 4 ++--
proxy/http/HttpSessionAccept.h | 2 +-
proxy/http/HttpTransact.cc | 6 +++---
proxy/http/HttpTransact.h | 4 ++--
proxy/http/HttpTransactCache.cc | 4 ++--
proxy/http/HttpTransactCache.h | 2 +-
proxy/http/HttpTransactHeaders.cc | 2 +-
proxy/http/HttpTunnel.cc | 4 ++--
proxy/http/HttpTunnel.h | 2 +-
proxy/http/HttpUpdateTester.cc | 4 ++--
proxy/http/Makefile.am | 2 --
proxy/http/RegressionHttpTransact.cc | 2 +-
proxy/http/TestHttpTransact.cc | 2 +-
proxy/http/remap/Makefile.am | 2 --
proxy/http/remap/RemapConfig.cc | 8 ++++----
proxy/http/remap/RemapPluginInfo.h | 2 +-
proxy/http/remap/RemapPlugins.h | 2 +-
proxy/http/remap/UrlMapping.cc | 4 ++--
proxy/http/remap/UrlMapping.h | 4 ++--
proxy/http/remap/UrlMappingPathIndex.h | 4 ++--
proxy/http/remap/UrlRewrite.cc | 2 +-
proxy/http/remap/UrlRewrite.h | 4 ++--
proxy/http/testheaders.cc | 2 +-
proxy/http2/HPACK.h | 2 +-
proxy/http2/HTTP2.cc | 4 ++--
proxy/http2/HTTP2.h | 4 ++--
proxy/http2/Http2SessionAccept.h | 2 +-
proxy/http2/HuffmanCodec.cc | 2 +-
proxy/http2/Makefile.am | 2 --
proxy/logcat.cc | 4 ++--
proxy/logging/Log.cc | 6 +++---
proxy/logging/Log.h | 2 +-
proxy/logging/LogAccess.cc | 2 +-
proxy/logging/LogAccess.h | 2 +-
proxy/logging/LogAccessHttp.cc | 2 +-
proxy/logging/LogAccessHttp.h | 2 +-
proxy/logging/LogAccessICP.cc | 2 +-
proxy/logging/LogBuffer.cc | 2 +-
proxy/logging/LogBuffer.h | 2 +-
proxy/logging/LogCollationAccept.cc | 2 +-
proxy/logging/LogCollationClientSM.cc | 2 +-
proxy/logging/LogCollationHostSM.cc | 2 +-
proxy/logging/LogConfig.cc | 12 ++++++------
proxy/logging/LogConfig.h | 2 +-
proxy/logging/LogField.cc | 2 +-
proxy/logging/LogField.h | 2 +-
proxy/logging/LogFieldAliasMap.cc | 4 ++--
proxy/logging/LogFieldAliasMap.h | 6 +++---
proxy/logging/LogFile.cc | 2 +-
proxy/logging/LogFile.h | 2 +-
proxy/logging/LogFilter.cc | 6 +++---
proxy/logging/LogFilter.h | 4 ++--
proxy/logging/LogFormat.cc | 6 +++---
proxy/logging/LogFormat.h | 2 +-
proxy/logging/LogHost.cc | 2 +-
proxy/logging/LogObject.cc | 2 +-
proxy/logging/LogObject.h | 2 +-
proxy/logging/LogSock.h | 2 +-
proxy/logging/LogStandalone.cc | 6 +++---
proxy/logging/LogUtils.cc | 2 +-
proxy/logging/LogUtils.h | 4 ++--
proxy/logging/Makefile.am | 2 --
proxy/logstats.cc | 10 +++++-----
proxy/sac.cc | 4 ++--
proxy/shared/DiagsConfig.cc | 4 ++--
proxy/shared/DiagsConfig.h | 2 +-
proxy/shared/Error.cc | 2 +-
proxy/shared/Error.h | 4 ++--
proxy/shared/InkXml.cc | 2 +-
proxy/shared/InkXml.h | 2 +-
proxy/shared/Makefile.am | 5 +----
proxy/shared/UglyLogStubs.cc | 2 +-
proxy/spdy/Makefile.am | 2 --
proxy/test_xml_parser.cc | 2 +-
tools/Makefile.am | 1 -
tools/http_load/http_load.c | 2 +-
tools/jtest/jtest.cc | 16 ++++++++--------
430 files changed, 768 insertions(+), 836 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/build/plugins.mk
----------------------------------------------------------------------
diff --git a/build/plugins.mk b/build/plugins.mk
index 4a23105..45c6957 100644
--- a/build/plugins.mk
+++ b/build/plugins.mk
@@ -25,7 +25,6 @@ TS_PLUGIN_LDFLAGS = \
TS_PLUGIN_CPPFLAGS = \
-I$(top_builddir)/proxy/api \
-I$(top_srcdir)/proxy/api \
- -I$(top_builddir)/lib \
-I$(top_srcdir)/lib
# Provide a default AM_CPPFLAGS. Automake handles this correctly, but libtool
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/cmd/traffic_cop/Makefile.am
----------------------------------------------------------------------
diff --git a/cmd/traffic_cop/Makefile.am b/cmd/traffic_cop/Makefile.am
index 74c4f6f..027180f 100644
--- a/cmd/traffic_cop/Makefile.am
+++ b/cmd/traffic_cop/Makefile.am
@@ -20,8 +20,6 @@
AM_CPPFLAGS = $(iocore_include_dirs) \
-I$(top_srcdir)/lib \
-I$(top_srcdir)/lib/records \
- -I$(top_srcdir)/lib/ts \
- -I$(top_builddir)/lib/ts \
-I$(top_srcdir)/mgmt \
-I$(top_srcdir)/mgmt/cluster \
-I$(top_srcdir)/mgmt/api/include
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/cmd/traffic_cop/traffic_cop.cc
----------------------------------------------------------------------
diff --git a/cmd/traffic_cop/traffic_cop.cc b/cmd/traffic_cop/traffic_cop.cc
index e3476fe..dc275f1 100644
--- a/cmd/traffic_cop/traffic_cop.cc
+++ b/cmd/traffic_cop/traffic_cop.cc
@@ -21,14 +21,14 @@
limitations under the License.
*/
-#include "libts.h"
-#include "I_Layout.h"
-#include "I_Version.h"
+#include "ts/libts.h"
+#include "ts/I_Layout.h"
+#include "ts/I_Version.h"
#include "I_RecCore.h"
#include "mgmtapi.h"
#include "RecordsConfig.h"
#include "ClusterCom.h"
-#include "ink_cap.h"
+#include "ts/ink_cap.h"
#include <string>
#include <map>
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/cmd/traffic_crashlog/Makefile.am
----------------------------------------------------------------------
diff --git a/cmd/traffic_crashlog/Makefile.am b/cmd/traffic_crashlog/Makefile.am
index fa537a8..e127b65 100644
--- a/cmd/traffic_crashlog/Makefile.am
+++ b/cmd/traffic_crashlog/Makefile.am
@@ -20,8 +20,6 @@ bin_PROGRAMS = traffic_crashlog
AM_CPPFLAGS = \
$(iocore_include_dirs) \
-I$(top_srcdir)/lib \
- -I$(top_srcdir)/lib/ts \
- -I$(top_builddir)/lib/ts \
-I$(top_srcdir)/lib/records \
-I$(top_srcdir)/mgmt \
-I$(top_srcdir)/mgmt/utils \
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/cmd/traffic_crashlog/traffic_crashlog.cc
----------------------------------------------------------------------
diff --git a/cmd/traffic_crashlog/traffic_crashlog.cc b/cmd/traffic_crashlog/traffic_crashlog.cc
index e35085f..9c9e13c 100644
--- a/cmd/traffic_crashlog/traffic_crashlog.cc
+++ b/cmd/traffic_crashlog/traffic_crashlog.cc
@@ -22,10 +22,10 @@
*/
#include "traffic_crashlog.h"
-#include "ink_args.h"
-#include "ink_cap.h"
-#include "I_Version.h"
-#include "I_Layout.h"
+#include "ts/ink_args.h"
+#include "ts/ink_cap.h"
+#include "ts/I_Version.h"
+#include "ts/I_Layout.h"
#include "I_RecProcess.h"
#include "RecordsConfig.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/cmd/traffic_crashlog/traffic_crashlog.h
----------------------------------------------------------------------
diff --git a/cmd/traffic_crashlog/traffic_crashlog.h b/cmd/traffic_crashlog/traffic_crashlog.h
index 0b066d1..e5e6e5a 100644
--- a/cmd/traffic_crashlog/traffic_crashlog.h
+++ b/cmd/traffic_crashlog/traffic_crashlog.h
@@ -24,7 +24,7 @@
#ifndef __TRAFFIC_CRASHLOG_H__
#define __TRAFFIC_CRASHLOG_H__
-#include "libts.h"
+#include "ts/libts.h"
#include "mgmtapi.h"
// ucontext.h is deprecated on Darwin, and we really only need it on Linux, so only
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/cmd/traffic_ctl/Makefile.am
----------------------------------------------------------------------
diff --git a/cmd/traffic_ctl/Makefile.am b/cmd/traffic_ctl/Makefile.am
index cf471cc..5b7731b 100644
--- a/cmd/traffic_ctl/Makefile.am
+++ b/cmd/traffic_ctl/Makefile.am
@@ -20,8 +20,6 @@
AM_CPPFLAGS = \
$(iocore_include_dirs) \
-I$(top_srcdir)/lib \
- -I$(top_srcdir)/lib/ts \
- -I$(top_builddir)/lib/ts \
-I$(top_srcdir)/lib/records \
-I$(top_srcdir)/mgmt/api/include
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/cmd/traffic_ctl/traffic_ctl.h
----------------------------------------------------------------------
diff --git a/cmd/traffic_ctl/traffic_ctl.h b/cmd/traffic_ctl/traffic_ctl.h
index b77ee40..5273e2b 100644
--- a/cmd/traffic_ctl/traffic_ctl.h
+++ b/cmd/traffic_ctl/traffic_ctl.h
@@ -24,10 +24,10 @@
#ifndef _TRAFFIC_CTRL_H_
#define _TRAFFIC_CTRL_H_
-#include "libts.h"
+#include "ts/libts.h"
#include "mgmtapi.h"
-#include "ink_args.h"
-#include "I_Version.h"
+#include "ts/ink_args.h"
+#include "ts/I_Version.h"
#include <vector>
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/cmd/traffic_layout/Makefile.am
----------------------------------------------------------------------
diff --git a/cmd/traffic_layout/Makefile.am b/cmd/traffic_layout/Makefile.am
index f0998ca..f0da43a 100644
--- a/cmd/traffic_layout/Makefile.am
+++ b/cmd/traffic_layout/Makefile.am
@@ -20,8 +20,6 @@ bin_PROGRAMS = traffic_layout
AM_CPPFLAGS = \
$(iocore_include_dirs) \
-I$(top_srcdir)/lib \
- -I$(top_srcdir)/lib/ts \
- -I$(top_builddir)/lib/ts \
-I$(top_srcdir)/lib/records \
-I$(top_srcdir)/mgmt \
-I$(top_srcdir)/mgmt/utils
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/cmd/traffic_layout/traffic_layout.cc
----------------------------------------------------------------------
diff --git a/cmd/traffic_layout/traffic_layout.cc b/cmd/traffic_layout/traffic_layout.cc
index 72d92c6..1f73e8d 100644
--- a/cmd/traffic_layout/traffic_layout.cc
+++ b/cmd/traffic_layout/traffic_layout.cc
@@ -21,11 +21,11 @@
limitations under the License.
*/
-#include "libts.h"
-#include "ink_args.h"
-#include "ink_config.h"
-#include "I_Version.h"
-#include "I_Layout.h"
+#include "ts/libts.h"
+#include "ts/ink_args.h"
+#include "ts/ink_config.h"
+#include "ts/I_Version.h"
+#include "ts/I_Layout.h"
#include "I_RecProcess.h"
#include "RecordsConfig.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/cmd/traffic_line/Makefile.am
----------------------------------------------------------------------
diff --git a/cmd/traffic_line/Makefile.am b/cmd/traffic_line/Makefile.am
index 0bf778d..52f00ca 100644
--- a/cmd/traffic_line/Makefile.am
+++ b/cmd/traffic_line/Makefile.am
@@ -20,8 +20,6 @@
AM_CPPFLAGS = \
$(iocore_include_dirs) \
-I$(top_srcdir)/lib \
- -I$(top_srcdir)/lib/ts \
- -I$(top_builddir)/lib/ts \
-I$(top_srcdir)/mgmt/api/include
AM_LDFLAGS = \
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/cmd/traffic_line/traffic_line.cc
----------------------------------------------------------------------
diff --git a/cmd/traffic_line/traffic_line.cc b/cmd/traffic_line/traffic_line.cc
index 0c10839..975de65 100644
--- a/cmd/traffic_line/traffic_line.cc
+++ b/cmd/traffic_line/traffic_line.cc
@@ -21,12 +21,12 @@
limitations under the License.
*/
-#include "libts.h"
+#include "ts/libts.h"
-#include "ink_args.h"
-#include "I_Version.h"
-#include "Tokenizer.h"
-#include "TextBuffer.h"
+#include "ts/ink_args.h"
+#include "ts/I_Version.h"
+#include "ts/Tokenizer.h"
+#include "ts/TextBuffer.h"
#include "mgmtapi.h"
#include <stdio.h>
#include <string.h>
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/cmd/traffic_manager/AddConfigFilesHere.cc
----------------------------------------------------------------------
diff --git a/cmd/traffic_manager/AddConfigFilesHere.cc b/cmd/traffic_manager/AddConfigFilesHere.cc
index ea9066b..56b7aca 100644
--- a/cmd/traffic_manager/AddConfigFilesHere.cc
+++ b/cmd/traffic_manager/AddConfigFilesHere.cc
@@ -21,10 +21,10 @@
limitations under the License.
*/
-#include "ink_platform.h"
+#include "ts/ink_platform.h"
#include "MgmtUtils.h"
#include "ConfigParse.h"
-#include "Diags.h"
+#include "ts/Diags.h"
#include "FileManager.h"
extern FileManager *configFiles;
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/cmd/traffic_manager/Makefile.am
----------------------------------------------------------------------
diff --git a/cmd/traffic_manager/Makefile.am b/cmd/traffic_manager/Makefile.am
index 7046eef..04ada52 100644
--- a/cmd/traffic_manager/Makefile.am
+++ b/cmd/traffic_manager/Makefile.am
@@ -20,8 +20,6 @@ bin_PROGRAMS = traffic_manager
AM_CPPFLAGS = \
$(iocore_include_dirs) \
-I$(top_srcdir)/lib/records \
- -I$(top_srcdir)/lib/ts \
- -I$(top_builddir)/lib/ts \
-I$(top_srcdir)/proxy \
-I$(top_srcdir)/proxy/hdrs \
-I$(top_srcdir)/proxy/shared \
@@ -30,8 +28,7 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/mgmt/api/include \
-I$(top_srcdir)/mgmt/cluster \
-I$(top_srcdir)/mgmt/utils \
- -I$(top_srcdir)/lib \
- -I$(top_builddir)/lib
+ -I$(top_srcdir)/lib
AM_LDFLAGS = \
@EXTRA_CXX_LDFLAGS@ \
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/cmd/traffic_manager/MgmtHandlers.cc
----------------------------------------------------------------------
diff --git a/cmd/traffic_manager/MgmtHandlers.cc b/cmd/traffic_manager/MgmtHandlers.cc
index 2db9459..fe9bef2 100644
--- a/cmd/traffic_manager/MgmtHandlers.cc
+++ b/cmd/traffic_manager/MgmtHandlers.cc
@@ -27,8 +27,8 @@
*
****************************************************************************/
-#include "libts.h"
-#include "I_Layout.h"
+#include "ts/libts.h"
+#include "ts/I_Layout.h"
#include "LocalManager.h"
#include "Alarms.h"
#include "MgmtUtils.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/cmd/traffic_manager/StatProcessor.cc
----------------------------------------------------------------------
diff --git a/cmd/traffic_manager/StatProcessor.cc b/cmd/traffic_manager/StatProcessor.cc
index 9202aca..2784928 100644
--- a/cmd/traffic_manager/StatProcessor.cc
+++ b/cmd/traffic_manager/StatProcessor.cc
@@ -30,7 +30,7 @@
*
****************************************************************************/
-#include "libts.h"
+#include "ts/libts.h"
#include "StatProcessor.h"
#include "FileManager.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/cmd/traffic_manager/StatProcessor.h
----------------------------------------------------------------------
diff --git a/cmd/traffic_manager/StatProcessor.h b/cmd/traffic_manager/StatProcessor.h
index c6b3dd8..0d3b751 100644
--- a/cmd/traffic_manager/StatProcessor.h
+++ b/cmd/traffic_manager/StatProcessor.h
@@ -32,12 +32,12 @@
*
****************************************************************************/
-#include "ink_platform.h"
+#include "ts/ink_platform.h"
#include <stdarg.h>
#include "MgmtUtils.h"
#include "MgmtDefs.h"
#include "WebMgmtUtils.h"
-#include "ink_hrtime.h"
+#include "ts/ink_hrtime.h"
#include "LocalManager.h"
#include "WebOverview.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/cmd/traffic_manager/StatType.cc
----------------------------------------------------------------------
diff --git a/cmd/traffic_manager/StatType.cc b/cmd/traffic_manager/StatType.cc
index 11b1484..1e9a4d0 100644
--- a/cmd/traffic_manager/StatType.cc
+++ b/cmd/traffic_manager/StatType.cc
@@ -30,12 +30,12 @@
*
****************************************************************************/
-#include "ink_config.h"
+#include "ts/ink_config.h"
#include "StatType.h"
#include "MgmtUtils.h"
-#include "ink_hrtime.h"
+#include "ts/ink_hrtime.h"
#include "WebOverview.h"
-#include "Tokenizer.h"
+#include "ts/Tokenizer.h"
bool StatError = false; // global error flag
bool StatDebug = false; // global debug flag
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/cmd/traffic_manager/StatXML.cc
----------------------------------------------------------------------
diff --git a/cmd/traffic_manager/StatXML.cc b/cmd/traffic_manager/StatXML.cc
index 1d6a7ba..bda2005 100644
--- a/cmd/traffic_manager/StatXML.cc
+++ b/cmd/traffic_manager/StatXML.cc
@@ -21,7 +21,7 @@
limitations under the License.
*/
-#include "ink_config.h"
+#include "ts/ink_config.h"
#include "StatXML.h"
#include <stdlib.h>
#include <ctype.h>
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/cmd/traffic_manager/StatXML.h
----------------------------------------------------------------------
diff --git a/cmd/traffic_manager/StatXML.h b/cmd/traffic_manager/StatXML.h
index 249be2f..a7aa3f2 100644
--- a/cmd/traffic_manager/StatXML.h
+++ b/cmd/traffic_manager/StatXML.h
@@ -26,7 +26,7 @@
#define _STATXML_H_
#include "WebMgmtUtils.h"
-#include "List.h"
+#include "ts/List.h"
typedef enum {
INVALID_TAG = -1,
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/cmd/traffic_manager/WebOverview.cc
----------------------------------------------------------------------
diff --git a/cmd/traffic_manager/WebOverview.cc b/cmd/traffic_manager/WebOverview.cc
index 252820d..b321b1c 100644
--- a/cmd/traffic_manager/WebOverview.cc
+++ b/cmd/traffic_manager/WebOverview.cc
@@ -28,7 +28,7 @@
*
****************************************************************************/
-#include "libts.h"
+#include "ts/libts.h"
#include "MgmtDefs.h"
#include "WebOverview.h"
@@ -38,7 +38,7 @@
#include "ClusterCom.h"
#include "MgmtUtils.h"
#include "MgmtDefs.h"
-#include "Diags.h"
+#include "ts/Diags.h"
// Make this pointer to avoid nasty destruction
// problems do to alarm
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/cmd/traffic_manager/WebOverview.h
----------------------------------------------------------------------
diff --git a/cmd/traffic_manager/WebOverview.h b/cmd/traffic_manager/WebOverview.h
index 447cfa5..ee88cf1 100644
--- a/cmd/traffic_manager/WebOverview.h
+++ b/cmd/traffic_manager/WebOverview.h
@@ -24,10 +24,10 @@
#ifndef _WEB_OVERVIEW_H_
#define _WEB_OVERVIEW_H_
-#include "ink_hash_table.h"
-#include "ink_mutex.h"
-#include "TextBuffer.h"
-#include "List.h"
+#include "ts/ink_hash_table.h"
+#include "ts/ink_mutex.h"
+#include "ts/TextBuffer.h"
+#include "ts/List.h"
#include "ExpandingArray.h"
#include "ClusterCom.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/cmd/traffic_manager/traffic_manager.cc
----------------------------------------------------------------------
diff --git a/cmd/traffic_manager/traffic_manager.cc b/cmd/traffic_manager/traffic_manager.cc
index 6714c62..a290c15 100644
--- a/cmd/traffic_manager/traffic_manager.cc
+++ b/cmd/traffic_manager/traffic_manager.cc
@@ -21,16 +21,16 @@
limitations under the License.
*/
-#include "ink_sys_control.h"
-#include "ink_cap.h"
+#include "ts/ink_sys_control.h"
+#include "ts/ink_cap.h"
#include "WebMgmtUtils.h"
#include "NetworkUtilsRemote.h"
#include "ClusterCom.h"
#include "VMap.h"
#include "FileManager.h"
-#include "I_Layout.h"
-#include "I_Version.h"
+#include "ts/I_Layout.h"
+#include "ts/I_Version.h"
#include "DiagsConfig.h"
#include "HTTP.h"
#include "CoreAPI.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/cmd/traffic_top/Makefile.am
----------------------------------------------------------------------
diff --git a/cmd/traffic_top/Makefile.am b/cmd/traffic_top/Makefile.am
index 1fba7be..922e507 100644
--- a/cmd/traffic_top/Makefile.am
+++ b/cmd/traffic_top/Makefile.am
@@ -21,8 +21,6 @@ if BUILD_TRAFFIC_TOP
AM_CPPFLAGS = \
$(iocore_include_dirs) \
-I$(top_srcdir)/lib \
- -I$(top_srcdir)/lib/ts \
- -I$(top_builddir)/lib/ts \
-I$(top_srcdir)/mgmt/api/include \
@CURL_CFLAGS@
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/cmd/traffic_top/traffic_top.cc
----------------------------------------------------------------------
diff --git a/cmd/traffic_top/traffic_top.cc b/cmd/traffic_top/traffic_top.cc
index df447c2..c50140a 100644
--- a/cmd/traffic_top/traffic_top.cc
+++ b/cmd/traffic_top/traffic_top.cc
@@ -21,7 +21,7 @@
limitations under the License.
*/
-#include "ink_config.h"
+#include "ts/ink_config.h"
#include <map>
#include <list>
#include <string>
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/cmd/traffic_via/Makefile.am
----------------------------------------------------------------------
diff --git a/cmd/traffic_via/Makefile.am b/cmd/traffic_via/Makefile.am
index a5bc285..d09d8cc 100644
--- a/cmd/traffic_via/Makefile.am
+++ b/cmd/traffic_via/Makefile.am
@@ -20,8 +20,6 @@
AM_CPPFLAGS = \
$(iocore_include_dirs) \
-I$(top_srcdir)/lib \
- -I$(top_srcdir)/lib/ts \
- -I$(top_builddir)/lib/ts \
-I$(top_srcdir)/mgmt/api/include
AM_LDFLAGS = \
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/cmd/traffic_via/traffic_via.cc
----------------------------------------------------------------------
diff --git a/cmd/traffic_via/traffic_via.cc b/cmd/traffic_via/traffic_via.cc
index 7426d1b..b329704 100644
--- a/cmd/traffic_via/traffic_via.cc
+++ b/cmd/traffic_via/traffic_via.cc
@@ -21,16 +21,16 @@
limitations under the License.
*/
-#include "libts.h"
+#include "ts/libts.h"
-#include "ink_args.h"
-#include "I_Version.h"
-#include "Tokenizer.h"
-#include "TextBuffer.h"
+#include "ts/ink_args.h"
+#include "ts/I_Version.h"
+#include "ts/Tokenizer.h"
+#include "ts/TextBuffer.h"
#include "mgmtapi.h"
#include <stdio.h>
#include <string.h>
-#include "Regex.h"
+#include "ts/Regex.h"
/// XXX Use DFA or Regex wrappers?
#ifdef HAVE_PCRE_PCRE_H
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/cmd/traffic_wccp/Makefile.am
----------------------------------------------------------------------
diff --git a/cmd/traffic_wccp/Makefile.am b/cmd/traffic_wccp/Makefile.am
index f7b6148..12a66fd 100644
--- a/cmd/traffic_wccp/Makefile.am
+++ b/cmd/traffic_wccp/Makefile.am
@@ -21,7 +21,6 @@
AM_CPPFLAGS = $(iocore_include_dirs) \
-I$(top_srcdir)/lib \
-I$(top_srcdir)/lib/records \
- -I$(top_srcdir)/lib/ts \
-I$(top_srcdir)/lib/wccp \
@OPENSSL_INCLUDES@
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/cmd/traffic_wccp/wccp_client.cc
----------------------------------------------------------------------
diff --git a/cmd/traffic_wccp/wccp_client.cc b/cmd/traffic_wccp/wccp_client.cc
index 7d08fcb..312772c 100644
--- a/cmd/traffic_wccp/wccp_client.cc
+++ b/cmd/traffic_wccp/wccp_client.cc
@@ -36,11 +36,11 @@
#include <poll.h>
-#include "ink_memory.h"
+#include "ts/ink_memory.h"
#include "Wccp.h"
#include "WccpUtil.h"
#include "tsconfig/TsValue.h"
-#include "ink_lockfile.h"
+#include "ts/ink_lockfile.h"
#define WCCP_LOCK "wccp.pid"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/example/session-1/session-1.c
----------------------------------------------------------------------
diff --git a/example/session-1/session-1.c b/example/session-1/session-1.c
index 8f51c8a..bd1e761 100644
--- a/example/session-1/session-1.c
+++ b/example/session-1/session-1.c
@@ -31,7 +31,7 @@
#include <stdio.h>
#include "ts/ts.h"
-#include "ink_defs.h"
+#include "ts/ink_defs.h"
static INKStat transaction_count;
static INKStat session_count;
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/iocore/aio/I_AIO.h
----------------------------------------------------------------------
diff --git a/iocore/aio/I_AIO.h b/iocore/aio/I_AIO.h
index 806962d..ea765d2 100644
--- a/iocore/aio/I_AIO.h
+++ b/iocore/aio/I_AIO.h
@@ -31,7 +31,7 @@
#if !defined(_I_AIO_h_)
#define _I_AIO_h_
-#include "libts.h"
+#include "ts/libts.h"
#include "I_EventSystem.h"
#include "I_RecProcess.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/iocore/aio/Makefile.am
----------------------------------------------------------------------
diff --git a/iocore/aio/Makefile.am b/iocore/aio/Makefile.am
index bb9c1ca..b31ed3b 100644
--- a/iocore/aio/Makefile.am
+++ b/iocore/aio/Makefile.am
@@ -19,9 +19,7 @@
AM_CPPFLAGS = \
-I$(top_srcdir)/iocore/eventsystem \
-I$(top_srcdir)/lib \
- -I$(top_srcdir)/lib/records \
- -I$(top_srcdir)/lib/ts \
- -I$(top_builddir)/lib/ts
+ -I$(top_srcdir)/lib/records
TESTS = test_AIO.sample
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/iocore/aio/test_AIO.cc
----------------------------------------------------------------------
diff --git a/iocore/aio/test_AIO.cc b/iocore/aio/test_AIO.cc
index 179e451..ae6cbe6 100644
--- a/iocore/aio/test_AIO.cc
+++ b/iocore/aio/test_AIO.cc
@@ -23,7 +23,7 @@
#include "P_AIO.h"
#include "InkAPIInternal.h"
-#include "I_Layout.h"
+#include "ts/I_Layout.h"
#include <iostream>
#include <fstream>
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/iocore/cache/Cache.cc
----------------------------------------------------------------------
diff --git a/iocore/cache/Cache.cc b/iocore/cache/Cache.cc
index bfc5f84..d0b5917 100644
--- a/iocore/cache/Cache.cc
+++ b/iocore/cache/Cache.cc
@@ -28,7 +28,7 @@
#include "P_CacheTest.h"
#include "StatPages.h"
-#include "I_Layout.h"
+#include "ts/I_Layout.h"
#ifdef HTTP_CACHE
#include "HttpTransactCache.h"
@@ -38,7 +38,7 @@
#include "P_CacheBC.h"
#endif
-#include "hugepages.h"
+#include "ts/hugepages.h"
// Compilation Options
#define USELESS_REENABLES // allow them for now
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/iocore/cache/CacheDir.cc
----------------------------------------------------------------------
diff --git a/iocore/cache/CacheDir.cc b/iocore/cache/CacheDir.cc
index 978bbfa..62c84de 100644
--- a/iocore/cache/CacheDir.cc
+++ b/iocore/cache/CacheDir.cc
@@ -24,13 +24,13 @@
#include "P_Cache.h"
-#include "hugepages.h"
+#include "ts/hugepages.h"
// #define LOOP_CHECK_MODE 1
#ifdef LOOP_CHECK_MODE
#define DIR_LOOP_THRESHOLD 1000
#endif
-#include "ink_stack_trace.h"
+#include "ts/ink_stack_trace.h"
#define CACHE_INC_DIR_USED(_m) \
do { \
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/iocore/cache/CacheHosting.cc
----------------------------------------------------------------------
diff --git a/iocore/cache/CacheHosting.cc b/iocore/cache/CacheHosting.cc
index 6faa100..3281f79 100644
--- a/iocore/cache/CacheHosting.cc
+++ b/iocore/cache/CacheHosting.cc
@@ -22,7 +22,7 @@
*/
#include "P_Cache.h"
-#include "I_Layout.h"
+#include "ts/I_Layout.h"
extern int gndisks;
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/iocore/cache/CacheHttp.cc
----------------------------------------------------------------------
diff --git a/iocore/cache/CacheHttp.cc b/iocore/cache/CacheHttp.cc
index 3d7dfba..d0d502f 100644
--- a/iocore/cache/CacheHttp.cc
+++ b/iocore/cache/CacheHttp.cc
@@ -21,7 +21,7 @@
limitations under the License.
*/
-#include "ink_config.h"
+#include "ts/ink_config.h"
#include <string.h>
#include "P_Cache.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/iocore/cache/I_Cache.h
----------------------------------------------------------------------
diff --git a/iocore/cache/I_Cache.h b/iocore/cache/I_Cache.h
index 77aafe9..e41eecb 100644
--- a/iocore/cache/I_Cache.h
+++ b/iocore/cache/I_Cache.h
@@ -24,7 +24,7 @@
#ifndef _I_CACHE_H__
#define _I_CACHE_H__
-#include "libts.h"
+#include "ts/libts.h"
#include "I_EventSystem.h"
#include "I_AIO.h"
#include "I_CacheDefs.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/iocore/cache/I_Store.h
----------------------------------------------------------------------
diff --git a/iocore/cache/I_Store.h b/iocore/cache/I_Store.h
index b5f9721..800bddd 100644
--- a/iocore/cache/I_Store.h
+++ b/iocore/cache/I_Store.h
@@ -31,7 +31,7 @@
#ifndef _Store_h_
#define _Store_h_
-#include "libts.h"
+#include "ts/libts.h"
#define STORE_BLOCK_SIZE 8192
#define STORE_BLOCK_SHIFT 13
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/iocore/cache/Makefile.am
----------------------------------------------------------------------
diff --git a/iocore/cache/Makefile.am b/iocore/cache/Makefile.am
index 1e26a1e..2d4cced 100644
--- a/iocore/cache/Makefile.am
+++ b/iocore/cache/Makefile.am
@@ -20,8 +20,6 @@ AM_CPPFLAGS = \
$(iocore_include_dirs) \
-I$(top_srcdir)/lib \
-I$(top_srcdir)/lib/records \
- -I$(top_srcdir)/lib/ts \
- -I$(top_builddir)/lib/ts \
-I$(top_srcdir)/proxy/api/ts \
-I$(top_srcdir)/proxy \
-I$(top_srcdir)/proxy/hdrs \
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/iocore/cache/P_Cache.h
----------------------------------------------------------------------
diff --git a/iocore/cache/P_Cache.h b/iocore/cache/P_Cache.h
index ed738e3..def4bf0 100644
--- a/iocore/cache/P_Cache.h
+++ b/iocore/cache/P_Cache.h
@@ -24,7 +24,7 @@
#ifndef _P_CACHE_H__
#define _P_CACHE_H__
-#include "libts.h"
+#include "ts/libts.h"
#include "P_EventSystem.h"
#include "P_AIO.h"
#include "I_RecProcess.h"
@@ -32,7 +32,7 @@
#ifdef HTTP_CACHE
#include "HTTP.h"
#include "MIME.h"
-#include "MimeTable.h"
+#include "ts/MimeTable.h"
#include "HttpTransactCache.h"
#endif
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/iocore/cache/P_CacheInternal.h
----------------------------------------------------------------------
diff --git a/iocore/cache/P_CacheInternal.h b/iocore/cache/P_CacheInternal.h
index 4f91dbc..c607466 100644
--- a/iocore/cache/P_CacheInternal.h
+++ b/iocore/cache/P_CacheInternal.h
@@ -25,7 +25,7 @@
#ifndef _P_CACHE_INTERNAL_H__
#define _P_CACHE_INTERNAL_H__
-#include "libts.h"
+#include "ts/libts.h"
#ifdef HTTP_CACHE
#include "HTTP.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/iocore/cache/Store.cc
----------------------------------------------------------------------
diff --git a/iocore/cache/Store.cc b/iocore/cache/Store.cc
index a3bd5f8..0ca6e84 100644
--- a/iocore/cache/Store.cc
+++ b/iocore/cache/Store.cc
@@ -21,9 +21,9 @@
limitations under the License.
*/
-#include "libts.h"
+#include "ts/libts.h"
#include "P_Cache.h"
-#include "I_Layout.h"
+#include "ts/I_Layout.h"
#if HAVE_LINUX_MAJOR_H
#include <linux/major.h>
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/iocore/cluster/ClusterMachine.cc
----------------------------------------------------------------------
diff --git a/iocore/cluster/ClusterMachine.cc b/iocore/cluster/ClusterMachine.cc
index 2dee977..7173b11 100644
--- a/iocore/cluster/ClusterMachine.cc
+++ b/iocore/cluster/ClusterMachine.cc
@@ -26,10 +26,10 @@
Machine.cc
****************************************************************************/
-#include "ink_config.h"
+#include "ts/ink_config.h"
#include <unistd.h>
#include "P_Cluster.h"
-#include "I_Layout.h"
+#include "ts/I_Layout.h"
extern int num_of_cluster_threads;
MachineList *machines_config = NULL;
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/iocore/cluster/Makefile.am
----------------------------------------------------------------------
diff --git a/iocore/cluster/Makefile.am b/iocore/cluster/Makefile.am
index 8d526c6..9e7e400 100644
--- a/iocore/cluster/Makefile.am
+++ b/iocore/cluster/Makefile.am
@@ -20,8 +20,6 @@ AM_CPPFLAGS = \
$(iocore_include_dirs) \
-I$(top_srcdir)/lib \
-I$(top_srcdir)/lib/records \
- -I$(top_srcdir)/lib/ts \
- -I$(top_builddir)/lib/ts \
-I$(top_srcdir)/proxy/http \
-I$(top_srcdir)/proxy/hdrs \
-I$(top_srcdir)/proxy/api/ts \
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/iocore/cluster/P_Cluster.h
----------------------------------------------------------------------
diff --git a/iocore/cluster/P_Cluster.h b/iocore/cluster/P_Cluster.h
index 0376f63..7b6d1fe 100644
--- a/iocore/cluster/P_Cluster.h
+++ b/iocore/cluster/P_Cluster.h
@@ -24,7 +24,7 @@
#ifndef _P_CLUSTER_H__
#define _P_CLUSTER_H__
-#include "libts.h"
+#include "ts/libts.h"
#include "P_EventSystem.h"
#include "I_RecProcess.h"
#include "P_Net.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/iocore/dns/Makefile.am
----------------------------------------------------------------------
diff --git a/iocore/dns/Makefile.am b/iocore/dns/Makefile.am
index 46aa8d4..40c1ad3 100644
--- a/iocore/dns/Makefile.am
+++ b/iocore/dns/Makefile.am
@@ -20,8 +20,6 @@ AM_CPPFLAGS = \
$(iocore_include_dirs) \
-I$(top_srcdir)/lib \
-I$(top_srcdir)/lib/records \
- -I$(top_srcdir)/lib/ts \
- -I$(top_builddir)/lib/ts \
-I$(top_srcdir)/proxy \
-I$(top_srcdir)/proxy/http \
-I$(top_srcdir)/proxy/hdrs \
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/iocore/dns/P_DNS.h
----------------------------------------------------------------------
diff --git a/iocore/dns/P_DNS.h b/iocore/dns/P_DNS.h
index b37320e..e84f8a9 100644
--- a/iocore/dns/P_DNS.h
+++ b/iocore/dns/P_DNS.h
@@ -30,7 +30,7 @@
#if !defined(_P_DNS_h_)
#define _P_DNS_h_
-#include "libts.h"
+#include "ts/libts.h"
#include "I_DNS.h"
#include "P_EventSystem.h"
#include "I_Cache.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/iocore/dns/P_DNSProcessor.h
----------------------------------------------------------------------
diff --git a/iocore/dns/P_DNSProcessor.h b/iocore/dns/P_DNSProcessor.h
index 411671e..b72f152 100644
--- a/iocore/dns/P_DNSProcessor.h
+++ b/iocore/dns/P_DNSProcessor.h
@@ -26,7 +26,7 @@
/*
#include "I_DNS.h"
- #include "libts.h"
+ #include "ts/libts.h"
#include <arpa/nameser.h>
#include "I_Cache.h"
#include "P_Net.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/iocore/dns/SRV.h
----------------------------------------------------------------------
diff --git a/iocore/dns/SRV.h b/iocore/dns/SRV.h
index 45fe130..3329c1d 100644
--- a/iocore/dns/SRV.h
+++ b/iocore/dns/SRV.h
@@ -24,7 +24,7 @@
#ifndef _SRV_h_
#define _SRV_h_
-#include "libts.h"
+#include "ts/libts.h"
#include "I_HostDBProcessor.h"
struct HostDBInfo;
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/iocore/dns/SplitDNS.cc
----------------------------------------------------------------------
diff --git a/iocore/dns/SplitDNS.cc b/iocore/dns/SplitDNS.cc
index bb2bcdb..f8b4b61 100644
--- a/iocore/dns/SplitDNS.cc
+++ b/iocore/dns/SplitDNS.cc
@@ -28,13 +28,13 @@
*
****************************************************************************/
-#include "libts.h"
+#include "ts/libts.h"
#ifdef SPLIT_DNS
#include <sys/types.h>
#include "P_SplitDNS.h"
-#include "MatcherUtils.h"
-#include "HostLookup.h"
+#include "ts/MatcherUtils.h"
+#include "ts/HostLookup.h"
/* --------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/iocore/eventsystem/IOBuffer.cc
----------------------------------------------------------------------
diff --git a/iocore/eventsystem/IOBuffer.cc b/iocore/eventsystem/IOBuffer.cc
index 0c260a1..44535eb 100644
--- a/iocore/eventsystem/IOBuffer.cc
+++ b/iocore/eventsystem/IOBuffer.cc
@@ -25,7 +25,7 @@
UIOBuffer.cc
**************************************************************************/
-#include "ink_defs.h"
+#include "ts/ink_defs.h"
#include "P_EventSystem.h"
//
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/iocore/eventsystem/I_Action.h
----------------------------------------------------------------------
diff --git a/iocore/eventsystem/I_Action.h b/iocore/eventsystem/I_Action.h
index f59fe3b..2987acb 100644
--- a/iocore/eventsystem/I_Action.h
+++ b/iocore/eventsystem/I_Action.h
@@ -25,7 +25,7 @@
#ifndef _I_Action_h_
#define _I_Action_h_
-#include "libts.h"
+#include "ts/libts.h"
#include "I_Thread.h"
#include "I_Continuation.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/iocore/eventsystem/I_Continuation.h
----------------------------------------------------------------------
diff --git a/iocore/eventsystem/I_Continuation.h b/iocore/eventsystem/I_Continuation.h
index b2011c4..2015861 100644
--- a/iocore/eventsystem/I_Continuation.h
+++ b/iocore/eventsystem/I_Continuation.h
@@ -36,7 +36,7 @@
#ifndef _I_Continuation_h_
#define _I_Continuation_h_
-#include "libts.h"
+#include "ts/libts.h"
#include "I_Lock.h"
class Continuation;
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/iocore/eventsystem/I_EThread.h
----------------------------------------------------------------------
diff --git a/iocore/eventsystem/I_EThread.h b/iocore/eventsystem/I_EThread.h
index 0548ef4..3e7bed2 100644
--- a/iocore/eventsystem/I_EThread.h
+++ b/iocore/eventsystem/I_EThread.h
@@ -25,7 +25,7 @@
#ifndef _EThread_h_
#define _EThread_h_
-#include "libts.h"
+#include "ts/libts.h"
#include "I_Thread.h"
#include "I_PriorityEventQueue.h"
#include "I_ProtectedQueue.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/iocore/eventsystem/I_Event.h
----------------------------------------------------------------------
diff --git a/iocore/eventsystem/I_Event.h b/iocore/eventsystem/I_Event.h
index 05d6ee2..dc032dc 100644
--- a/iocore/eventsystem/I_Event.h
+++ b/iocore/eventsystem/I_Event.h
@@ -25,7 +25,7 @@
#ifndef _Event_h_
#define _Event_h_
-#include "libts.h"
+#include "ts/libts.h"
#include "I_Action.h"
//
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/iocore/eventsystem/I_EventProcessor.h
----------------------------------------------------------------------
diff --git a/iocore/eventsystem/I_EventProcessor.h b/iocore/eventsystem/I_EventProcessor.h
index 6cd53c8..45f9f2d 100644
--- a/iocore/eventsystem/I_EventProcessor.h
+++ b/iocore/eventsystem/I_EventProcessor.h
@@ -24,7 +24,7 @@
#ifndef _I_EventProcessor_h_
#define _I_EventProcessor_h_
-#include "libts.h"
+#include "ts/libts.h"
#include "I_Continuation.h"
#include "I_Processor.h"
#include "I_Event.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/iocore/eventsystem/I_EventSystem.h
----------------------------------------------------------------------
diff --git a/iocore/eventsystem/I_EventSystem.h b/iocore/eventsystem/I_EventSystem.h
index 5bfa2e0..9696890 100644
--- a/iocore/eventsystem/I_EventSystem.h
+++ b/iocore/eventsystem/I_EventSystem.h
@@ -25,7 +25,7 @@
#ifndef _I_EventSystem_h
#define _I_EventSystem_h
-#include "libts.h"
+#include "ts/libts.h"
#include "I_IOBuffer.h"
#include "I_Action.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/iocore/eventsystem/I_IOBuffer.h
----------------------------------------------------------------------
diff --git a/iocore/eventsystem/I_IOBuffer.h b/iocore/eventsystem/I_IOBuffer.h
index 6416e2b..4037c99 100644
--- a/iocore/eventsystem/I_IOBuffer.h
+++ b/iocore/eventsystem/I_IOBuffer.h
@@ -39,8 +39,8 @@
#if !defined(I_IOBuffer_h)
#define I_IOBuffer_h
-#include "libts.h"
-#include "ink_resource.h"
+#include "ts/libts.h"
+#include "ts/ink_resource.h"
struct MIOBufferAccessor;
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/iocore/eventsystem/I_Lock.h
----------------------------------------------------------------------
diff --git a/iocore/eventsystem/I_Lock.h b/iocore/eventsystem/I_Lock.h
index fe440ac..46e8cc2 100644
--- a/iocore/eventsystem/I_Lock.h
+++ b/iocore/eventsystem/I_Lock.h
@@ -24,7 +24,7 @@
#ifndef _I_Lock_h_
#define _I_Lock_h_
-#include "libts.h"
+#include "ts/libts.h"
#include "I_Thread.h"
#define MAX_LOCK_TIME HRTIME_MSECONDS(200)
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/iocore/eventsystem/I_PriorityEventQueue.h
----------------------------------------------------------------------
diff --git a/iocore/eventsystem/I_PriorityEventQueue.h b/iocore/eventsystem/I_PriorityEventQueue.h
index 3e649bc..69c7907 100644
--- a/iocore/eventsystem/I_PriorityEventQueue.h
+++ b/iocore/eventsystem/I_PriorityEventQueue.h
@@ -24,7 +24,7 @@
#ifndef _I_PriorityEventQueue_h_
#define _I_PriorityEventQueue_h_
-#include "libts.h"
+#include "ts/libts.h"
#include "I_Event.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/iocore/eventsystem/I_Processor.h
----------------------------------------------------------------------
diff --git a/iocore/eventsystem/I_Processor.h b/iocore/eventsystem/I_Processor.h
index a97fae7..ccea5da 100644
--- a/iocore/eventsystem/I_Processor.h
+++ b/iocore/eventsystem/I_Processor.h
@@ -25,7 +25,7 @@
#ifndef _I_Processor_h_
#define _I_Processor_h_
-#include "libts.h"
+#include "ts/libts.h"
#define PROCESSOR_RECONFIGURE 0x01
#define PROCESSOR_CHECK 0x02
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/iocore/eventsystem/I_ProtectedQueue.h
----------------------------------------------------------------------
diff --git a/iocore/eventsystem/I_ProtectedQueue.h b/iocore/eventsystem/I_ProtectedQueue.h
index 4d70e16..2f18991 100644
--- a/iocore/eventsystem/I_ProtectedQueue.h
+++ b/iocore/eventsystem/I_ProtectedQueue.h
@@ -35,7 +35,7 @@
#ifndef _I_ProtectedQueue_h_
#define _I_ProtectedQueue_h_
-#include "libts.h"
+#include "ts/libts.h"
#include "I_Event.h"
struct ProtectedQueue {
void enqueue(Event *e, bool fast_signal = false);
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/iocore/eventsystem/I_ProxyAllocator.h
----------------------------------------------------------------------
diff --git a/iocore/eventsystem/I_ProxyAllocator.h b/iocore/eventsystem/I_ProxyAllocator.h
index 2e26fd5..fe75be4 100644
--- a/iocore/eventsystem/I_ProxyAllocator.h
+++ b/iocore/eventsystem/I_ProxyAllocator.h
@@ -31,7 +31,7 @@
#ifndef _I_ProxyAllocator_h_
#define _I_ProxyAllocator_h_
-#include "libts.h"
+#include "ts/libts.h"
class EThread;
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/iocore/eventsystem/I_SocketManager.h
----------------------------------------------------------------------
diff --git a/iocore/eventsystem/I_SocketManager.h b/iocore/eventsystem/I_SocketManager.h
index 34b71a6..2e0e4c1 100644
--- a/iocore/eventsystem/I_SocketManager.h
+++ b/iocore/eventsystem/I_SocketManager.h
@@ -33,7 +33,7 @@
#ifndef _I_SocketManager_h_
#define _I_SocketManager_h_
-#include "libts.h"
+#include "ts/libts.h"
#include "I_EventSystem.h"
#include "I_Thread.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/iocore/eventsystem/I_Thread.h
----------------------------------------------------------------------
diff --git a/iocore/eventsystem/I_Thread.h b/iocore/eventsystem/I_Thread.h
index 9d74b69..dc5ba12 100644
--- a/iocore/eventsystem/I_Thread.h
+++ b/iocore/eventsystem/I_Thread.h
@@ -64,7 +64,7 @@
-- - include I_Event.h or
P_Event.h
#endif
-#include "libts.h"
+#include "ts/libts.h"
#include "I_ProxyAllocator.h"
class Thread;
class ProxyMutex;
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/iocore/eventsystem/I_VConnection.h
----------------------------------------------------------------------
diff --git a/iocore/eventsystem/I_VConnection.h b/iocore/eventsystem/I_VConnection.h
index a9b0469..ef7a628 100644
--- a/iocore/eventsystem/I_VConnection.h
+++ b/iocore/eventsystem/I_VConnection.h
@@ -25,7 +25,7 @@
#if !defined(_I_VConnection_h_)
#define _I_VConnection_h_
-#include "libts.h"
+#include "ts/libts.h"
#include "I_EventSystem.h"
#if !defined(I_VIO_h)
#error "include I_VIO.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/iocore/eventsystem/I_VIO.h
----------------------------------------------------------------------
diff --git a/iocore/eventsystem/I_VIO.h b/iocore/eventsystem/I_VIO.h
index 8d8bf97..b5a2197 100644
--- a/iocore/eventsystem/I_VIO.h
+++ b/iocore/eventsystem/I_VIO.h
@@ -25,14 +25,14 @@
#if !defined(I_VIO_h)
#define I_VIO_h
-#include "libts.h"
+#include "ts/libts.h"
#include "I_EventSystem.h"
#if !defined(I_IOBuffer_h)
#error "include I_IOBuffer.h"
-- -
include I_IOBuffer.h
#endif
-#include "ink_apidefs.h"
+#include "ts/ink_apidefs.h"
class Continuation;
class VConnection;
class IOVConnection;
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/iocore/eventsystem/Lock.cc
----------------------------------------------------------------------
diff --git a/iocore/eventsystem/Lock.cc b/iocore/eventsystem/Lock.cc
index 855a1b2..098884c 100644
--- a/iocore/eventsystem/Lock.cc
+++ b/iocore/eventsystem/Lock.cc
@@ -29,7 +29,7 @@
**************************************************************************/
#include "P_EventSystem.h"
-#include "Diags.h"
+#include "ts/Diags.h"
ClassAllocator<ProxyMutex> mutexAllocator("mutexAllocator");
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/iocore/eventsystem/Makefile.am
----------------------------------------------------------------------
diff --git a/iocore/eventsystem/Makefile.am b/iocore/eventsystem/Makefile.am
index 5dc3b57..ce0b9aa 100644
--- a/iocore/eventsystem/Makefile.am
+++ b/iocore/eventsystem/Makefile.am
@@ -18,9 +18,7 @@
AM_CPPFLAGS = \
-I$(top_srcdir)/lib \
- -I$(top_srcdir)/lib/records \
- -I$(top_srcdir)/lib/ts \
- -I$(top_builddir)/lib/ts
+ -I$(top_srcdir)/lib/records
TESTS = $(check_PROGRAMS)
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/iocore/eventsystem/P_EventSystem.h
----------------------------------------------------------------------
diff --git a/iocore/eventsystem/P_EventSystem.h b/iocore/eventsystem/P_EventSystem.h
index 26f9680..d24e053 100644
--- a/iocore/eventsystem/P_EventSystem.h
+++ b/iocore/eventsystem/P_EventSystem.h
@@ -31,7 +31,7 @@
#ifndef _P_EventSystem_h
#define _P_EventSystem_h
-#include "libts.h"
+#include "ts/libts.h"
#include "I_EventSystem.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/iocore/eventsystem/P_Freer.h
----------------------------------------------------------------------
diff --git a/iocore/eventsystem/P_Freer.h b/iocore/eventsystem/P_Freer.h
index e3f29f7..f48afd0 100644
--- a/iocore/eventsystem/P_Freer.h
+++ b/iocore/eventsystem/P_Freer.h
@@ -24,7 +24,7 @@
#if !defined(_P_Freer_h_)
#define _P_Freer_h_
-#include "libts.h"
+#include "ts/libts.h"
#include "I_Tasks.h"
// Note that these should not be used for memory that wishes to retain
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/iocore/eventsystem/P_IOBuffer.h
----------------------------------------------------------------------
diff --git a/iocore/eventsystem/P_IOBuffer.h b/iocore/eventsystem/P_IOBuffer.h
index 4a64972..7af9cdb 100644
--- a/iocore/eventsystem/P_IOBuffer.h
+++ b/iocore/eventsystem/P_IOBuffer.h
@@ -25,8 +25,8 @@
#if !defined(_P_IOBuffer_h)
#define _P_IOBuffer_h
-#include "libts.h"
-#include "ink_resource.h"
+#include "ts/libts.h"
+#include "ts/ink_resource.h"
// TODO: I think we're overly aggressive here on making MIOBuffer 64-bit
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/iocore/eventsystem/P_UnixSocketManager.h
----------------------------------------------------------------------
diff --git a/iocore/eventsystem/P_UnixSocketManager.h b/iocore/eventsystem/P_UnixSocketManager.h
index 280bd61..210b5e4 100644
--- a/iocore/eventsystem/P_UnixSocketManager.h
+++ b/iocore/eventsystem/P_UnixSocketManager.h
@@ -32,7 +32,7 @@
#ifndef _P_UnixSocketManager_h_
#define _P_UnixSocketManager_h_
-#include "libts.h"
+#include "ts/libts.h"
#include "I_SocketManager.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/iocore/eventsystem/SocketManager.cc
----------------------------------------------------------------------
diff --git a/iocore/eventsystem/SocketManager.cc b/iocore/eventsystem/SocketManager.cc
index 65af386..80b2adc 100644
--- a/iocore/eventsystem/SocketManager.cc
+++ b/iocore/eventsystem/SocketManager.cc
@@ -25,7 +25,7 @@
SocketManager.cc
****************************************************************************/
-#include "libts.h"
+#include "ts/libts.h"
#include "P_EventSystem.h"
SocketManager socketManager;
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/iocore/eventsystem/UnixEventProcessor.cc
----------------------------------------------------------------------
diff --git a/iocore/eventsystem/UnixEventProcessor.cc b/iocore/eventsystem/UnixEventProcessor.cc
index 9932472..204ce21 100644
--- a/iocore/eventsystem/UnixEventProcessor.cc
+++ b/iocore/eventsystem/UnixEventProcessor.cc
@@ -27,7 +27,7 @@
#include <alloca.h>
#include <hwloc.h>
#endif
-#include "ink_defs.h"
+#include "ts/ink_defs.h"
EventType
EventProcessor::spawn_event_threads(int n_threads, const char *et_name, size_t stacksize)
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/iocore/eventsystem/test_Buffer.cc
----------------------------------------------------------------------
diff --git a/iocore/eventsystem/test_Buffer.cc b/iocore/eventsystem/test_Buffer.cc
index 1826c76..7465add 100644
--- a/iocore/eventsystem/test_Buffer.cc
+++ b/iocore/eventsystem/test_Buffer.cc
@@ -22,7 +22,7 @@
*/
#include "I_EventSystem.h"
-#include "I_Layout.h"
+#include "ts/I_Layout.h"
#define TEST_TIME_SECOND 60
#define TEST_THREADS 2
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/iocore/eventsystem/test_Event.cc
----------------------------------------------------------------------
diff --git a/iocore/eventsystem/test_Event.cc b/iocore/eventsystem/test_Event.cc
index 5dbab87..9af7e88 100644
--- a/iocore/eventsystem/test_Event.cc
+++ b/iocore/eventsystem/test_Event.cc
@@ -22,7 +22,7 @@
*/
#include "I_EventSystem.h"
-#include "I_Layout.h"
+#include "ts/I_Layout.h"
#define TEST_TIME_SECOND 60
#define TEST_THREADS 2
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/iocore/hostdb/HostDB.cc
----------------------------------------------------------------------
diff --git a/iocore/hostdb/HostDB.cc b/iocore/hostdb/HostDB.cc
index f0319aa..6ed6937 100644
--- a/iocore/hostdb/HostDB.cc
+++ b/iocore/hostdb/HostDB.cc
@@ -24,7 +24,7 @@
#define _HOSTDB_CC_
#include "P_HostDB.h"
-#include "I_Layout.h"
+#include "ts/I_Layout.h"
#include "Show.h"
#include <vector>
@@ -35,7 +35,7 @@
//#define Warning
//#define Note
-#include "ink_apidefs.h"
+#include "ts/ink_apidefs.h"
HostDBProcessor hostDBProcessor;
int HostDBProcessor::hostdb_strict_round_robin = 0;
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/iocore/hostdb/Makefile.am
----------------------------------------------------------------------
diff --git a/iocore/hostdb/Makefile.am b/iocore/hostdb/Makefile.am
index 98c0414..cf8956d 100644
--- a/iocore/hostdb/Makefile.am
+++ b/iocore/hostdb/Makefile.am
@@ -20,8 +20,6 @@ AM_CPPFLAGS = \
$(iocore_include_dirs) \
-I$(top_srcdir)/lib \
-I$(top_srcdir)/lib/records \
- -I$(top_srcdir)/lib/ts \
- -I$(top_builddir)/lib/ts \
-I$(top_srcdir)/proxy \
-I$(top_srcdir)/proxy/hdrs \
-I$(top_srcdir)/proxy/http \
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/iocore/hostdb/MultiCache.cc
----------------------------------------------------------------------
diff --git a/iocore/hostdb/MultiCache.cc b/iocore/hostdb/MultiCache.cc
index 2b37be1..ba5ae89 100644
--- a/iocore/hostdb/MultiCache.cc
+++ b/iocore/hostdb/MultiCache.cc
@@ -28,12 +28,12 @@
****************************************************************************/
-#include "libts.h"
-#include "I_Layout.h"
+#include "ts/libts.h"
+#include "ts/I_Layout.h"
#include "P_HostDB.h"
#include "P_MultiCache.h"
#include "P_EventSystem.h" // FIXME: need to have this in I_* header files.
-#include "ink_file.h"
+#include "ts/ink_file.h"
static const int MC_SYNC_MIN_PAUSE_TIME = HRTIME_MSECONDS(200); // Pause for at least 200ms
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/iocore/hostdb/P_HostDB.h
----------------------------------------------------------------------
diff --git a/iocore/hostdb/P_HostDB.h b/iocore/hostdb/P_HostDB.h
index c78e051..8026cf5 100644
--- a/iocore/hostdb/P_HostDB.h
+++ b/iocore/hostdb/P_HostDB.h
@@ -31,7 +31,7 @@
#ifndef _P_HostDB_h_
#define _P_HostDB_h_
-#include "libts.h"
+#include "ts/libts.h"
#ifdef SPLIT_DNS
#include "P_SplitDNS.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/iocore/net/Connection.cc
----------------------------------------------------------------------
diff --git a/iocore/net/Connection.cc b/iocore/net/Connection.cc
index 508131a..4f90509 100644
--- a/iocore/net/Connection.cc
+++ b/iocore/net/Connection.cc
@@ -27,7 +27,7 @@
Commonality across all platforms -- move out as required.
**************************************************************************/
-#include "libts.h"
+#include "ts/libts.h"
#include "P_Net.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/iocore/net/I_Net.h
----------------------------------------------------------------------
diff --git a/iocore/net/I_Net.h b/iocore/net/I_Net.h
index 7573bcb..06d2d93 100644
--- a/iocore/net/I_Net.h
+++ b/iocore/net/I_Net.h
@@ -41,7 +41,7 @@
#ifndef __I_NET_H_
#define __I_NET_H_
-#include "I_Version.h"
+#include "ts/I_Version.h"
#include "I_EventSystem.h"
#include <netinet/in.h>
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/iocore/net/I_NetVConnection.h
----------------------------------------------------------------------
diff --git a/iocore/net/I_NetVConnection.h b/iocore/net/I_NetVConnection.h
index e9697be..9940a30 100644
--- a/iocore/net/I_NetVConnection.h
+++ b/iocore/net/I_NetVConnection.h
@@ -28,7 +28,7 @@
#include "I_Action.h"
#include "I_VConnection.h"
#include "I_Event.h"
-#include "List.h"
+#include "ts/List.h"
#include "I_IOBuffer.h"
#include "I_Socks.h"
#include <ts/apidefs.h>
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/iocore/net/I_UDPNet.h
----------------------------------------------------------------------
diff --git a/iocore/net/I_UDPNet.h b/iocore/net/I_UDPNet.h
index a3d1588..6f8fe6f 100644
--- a/iocore/net/I_UDPNet.h
+++ b/iocore/net/I_UDPNet.h
@@ -32,9 +32,9 @@
#ifndef __UDPNET_H_
#define __UDPNET_H_
-#include "I_Version.h"
+#include "ts/I_Version.h"
#include "I_EventSystem.h"
-#include "ink_inet.h"
+#include "ts/ink_inet.h"
/**
UDP service
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/iocore/net/Makefile.am
----------------------------------------------------------------------
diff --git a/iocore/net/Makefile.am b/iocore/net/Makefile.am
index 7c4b440..888d3c2 100644
--- a/iocore/net/Makefile.am
+++ b/iocore/net/Makefile.am
@@ -20,8 +20,6 @@ AM_CPPFLAGS = \
$(iocore_include_dirs) \
-I$(top_srcdir)/lib \
-I$(top_srcdir)/lib/records \
- -I$(top_srcdir)/lib/ts \
- -I$(top_builddir)/lib/ts \
-I$(top_srcdir)/proxy \
-I$(top_srcdir)/proxy/hdrs \
-I$(top_srcdir)/proxy/shared \
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/iocore/net/P_Connection.h
----------------------------------------------------------------------
diff --git a/iocore/net/P_Connection.h b/iocore/net/P_Connection.h
index 84d0d70..8783f9b 100644
--- a/iocore/net/P_Connection.h
+++ b/iocore/net/P_Connection.h
@@ -50,7 +50,7 @@
#ifndef __CONNECTION_H__
#define __CONNECTION_H__
-#include "libts.h"
+#include "ts/libts.h"
struct NetVCOptions;
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/iocore/net/P_Net.h
----------------------------------------------------------------------
diff --git a/iocore/net/P_Net.h b/iocore/net/P_Net.h
index 78aac91..7d63499 100644
--- a/iocore/net/P_Net.h
+++ b/iocore/net/P_Net.h
@@ -87,7 +87,7 @@ extern RecRawStatBlock *net_rsb;
#define NET_SUM_GLOBAL_DYN_STAT(_x, _r) RecIncrGlobalRawStatSum(net_rsb, (_x), (_r))
#define NET_READ_GLOBAL_DYN_SUM(_x, _sum) RecGetGlobalRawStatSum(net_rsb, _x, &_sum)
-#include "libts.h"
+#include "ts/libts.h"
#include "P_EventSystem.h"
#include "I_Net.h"
#include "P_NetVConnection.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/iocore/net/P_NetAccept.h
----------------------------------------------------------------------
diff --git a/iocore/net/P_NetAccept.h b/iocore/net/P_NetAccept.h
index 14a844a..8e43164 100644
--- a/iocore/net/P_NetAccept.h
+++ b/iocore/net/P_NetAccept.h
@@ -39,7 +39,7 @@
#ifndef __P_NETACCEPT_H__
#define __P_NETACCEPT_H__
-#include "libts.h"
+#include "ts/libts.h"
#include "P_Connection.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/iocore/net/P_NetVCTest.h
----------------------------------------------------------------------
diff --git a/iocore/net/P_NetVCTest.h b/iocore/net/P_NetVCTest.h
index bf7f9f3..855caf5 100644
--- a/iocore/net/P_NetVCTest.h
+++ b/iocore/net/P_NetVCTest.h
@@ -37,7 +37,7 @@
#ifndef _P_NET_VC_TEST_H_
#define _P_NET_VC_TEST_H_
-#include "libts.h"
+#include "ts/libts.h"
class VIO;
class MIOBuffer;
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/iocore/net/P_SSLClientUtils.h
----------------------------------------------------------------------
diff --git a/iocore/net/P_SSLClientUtils.h b/iocore/net/P_SSLClientUtils.h
index b0a1404..0b94df4 100644
--- a/iocore/net/P_SSLClientUtils.h
+++ b/iocore/net/P_SSLClientUtils.h
@@ -22,8 +22,8 @@
#ifndef IOCORE_NET_P_SSLCLIENTUTILS_H_
#define IOCORE_NET_P_SSLCLIENTUTILS_H_
-#include "ink_config.h"
-#include "Diags.h"
+#include "ts/ink_config.h"
+#include "ts/Diags.h"
#include "P_SSLUtils.h"
#include "P_SSLConfig.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/iocore/net/P_SSLNetAccept.h
----------------------------------------------------------------------
diff --git a/iocore/net/P_SSLNetAccept.h b/iocore/net/P_SSLNetAccept.h
index 71e8689..7533564 100644
--- a/iocore/net/P_SSLNetAccept.h
+++ b/iocore/net/P_SSLNetAccept.h
@@ -39,7 +39,7 @@
#if !defined(_SSLNetAccept_h_)
#define _SSLNetAccept_h_
-#include "libts.h"
+#include "ts/libts.h"
#include "P_Connection.h"
#include "P_NetAccept.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/iocore/net/P_SSLNetProcessor.h
----------------------------------------------------------------------
diff --git a/iocore/net/P_SSLNetProcessor.h b/iocore/net/P_SSLNetProcessor.h
index ec008dd..89e09a1 100644
--- a/iocore/net/P_SSLNetProcessor.h
+++ b/iocore/net/P_SSLNetProcessor.h
@@ -32,7 +32,7 @@
#ifndef __P_SSLNETPROCESSOR_H
#define __P_SSLNETPROCESSOR_H
-#include "libts.h"
+#include "ts/libts.h"
#include "P_Net.h"
#include "P_SSLConfig.h"
#include <openssl/ssl.h>
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/iocore/net/P_SSLNetVConnection.h
----------------------------------------------------------------------
diff --git a/iocore/net/P_SSLNetVConnection.h b/iocore/net/P_SSLNetVConnection.h
index 3b29e7b..fd09a18 100644
--- a/iocore/net/P_SSLNetVConnection.h
+++ b/iocore/net/P_SSLNetVConnection.h
@@ -32,11 +32,11 @@
#if !defined(_SSLNetVConnection_h_)
#define _SSLNetVConnection_h_
-#include "libts.h"
+#include "ts/libts.h"
#include "P_EventSystem.h"
#include "P_UnixNetVConnection.h"
#include "P_UnixNet.h"
-#include "apidefs.h"
+#include "ts/apidefs.h"
#include <openssl/ssl.h>
#include <openssl/err.h>
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/iocore/net/P_SSLNextProtocolSet.h
----------------------------------------------------------------------
diff --git a/iocore/net/P_SSLNextProtocolSet.h b/iocore/net/P_SSLNextProtocolSet.h
index fd38c15..9a04370 100644
--- a/iocore/net/P_SSLNextProtocolSet.h
+++ b/iocore/net/P_SSLNextProtocolSet.h
@@ -24,7 +24,7 @@
#ifndef P_SSLNextProtocolSet_H_
#define P_SSLNextProtocolSet_H_
-#include "List.h"
+#include "ts/List.h"
#include "I_Net.h"
class Continuation;
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/iocore/net/P_SSLUtils.h
----------------------------------------------------------------------
diff --git a/iocore/net/P_SSLUtils.h b/iocore/net/P_SSLUtils.h
index 57edf03..cc58e58 100644
--- a/iocore/net/P_SSLUtils.h
+++ b/iocore/net/P_SSLUtils.h
@@ -22,8 +22,8 @@
#ifndef __P_SSLUTILS_H__
#define __P_SSLUTILS_H__
-#include "ink_config.h"
-#include "Diags.h"
+#include "ts/ink_config.h"
+#include "ts/Diags.h"
#include "P_SSLClientUtils.h"
#define OPENSSL_THREAD_DEFINES
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/iocore/net/P_UnixNet.h
----------------------------------------------------------------------
diff --git a/iocore/net/P_UnixNet.h b/iocore/net/P_UnixNet.h
index 53e4e75..1363535 100644
--- a/iocore/net/P_UnixNet.h
+++ b/iocore/net/P_UnixNet.h
@@ -24,7 +24,7 @@
#ifndef __P_UNIXNET_H__
#define __P_UNIXNET_H__
-#include "libts.h"
+#include "ts/libts.h"
#define USE_EDGE_TRIGGER_EPOLL 1
#define USE_EDGE_TRIGGER_KQUEUE 1
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/iocore/net/P_UnixNetState.h
----------------------------------------------------------------------
diff --git a/iocore/net/P_UnixNetState.h b/iocore/net/P_UnixNetState.h
index efffe8f..5bdb6d0 100644
--- a/iocore/net/P_UnixNetState.h
+++ b/iocore/net/P_UnixNetState.h
@@ -40,7 +40,7 @@
#if !defined(_UnixNetState_h_)
#define _UnixNetState_h_
-#include "List.h"
+#include "ts/List.h"
#include "I_VIO.h"
class Event;
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/iocore/net/P_UnixNetVConnection.h
----------------------------------------------------------------------
diff --git a/iocore/net/P_UnixNetVConnection.h b/iocore/net/P_UnixNetVConnection.h
index 52f5335..92bfeac 100644
--- a/iocore/net/P_UnixNetVConnection.h
+++ b/iocore/net/P_UnixNetVConnection.h
@@ -32,7 +32,7 @@
#ifndef __P_UNIXNETVCONNECTION_H__
#define __P_UNIXNETVCONNECTION_H__
-#include "ink_sock.h"
+#include "ts/ink_sock.h"
#include "I_NetVConnection.h"
#include "P_UnixNetState.h"
#include "P_Connection.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/iocore/net/P_UnixPollDescriptor.h
----------------------------------------------------------------------
diff --git a/iocore/net/P_UnixPollDescriptor.h b/iocore/net/P_UnixPollDescriptor.h
index 88b8f38..d56213b 100644
--- a/iocore/net/P_UnixPollDescriptor.h
+++ b/iocore/net/P_UnixPollDescriptor.h
@@ -30,7 +30,7 @@
#ifndef __P_UNIXPOLLDESCRIPTOR_H__
#define __P_UNIXPOLLDESCRIPTOR_H__
-#include "libts.h"
+#include "ts/libts.h"
#if TS_USE_KQUEUE
#include <sys/event.h>
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/iocore/net/SSLCertLookup.cc
----------------------------------------------------------------------
diff --git a/iocore/net/SSLCertLookup.cc b/iocore/net/SSLCertLookup.cc
index d6b76bc..c7f3a8f 100644
--- a/iocore/net/SSLCertLookup.cc
+++ b/iocore/net/SSLCertLookup.cc
@@ -21,15 +21,15 @@
limitations under the License.
*/
-#include "ink_config.h"
+#include "ts/ink_config.h"
#include "P_SSLCertLookup.h"
#include "P_SSLUtils.h"
#include "P_SSLConfig.h"
#include "I_EventSystem.h"
-#include "I_Layout.h"
-#include "Regex.h"
-#include "Trie.h"
+#include "ts/I_Layout.h"
+#include "ts/Regex.h"
+#include "ts/Trie.h"
#include "ts/TestBox.h"
struct SSLAddressLookupKey {
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/iocore/net/SSLClientUtils.cc
----------------------------------------------------------------------
diff --git a/iocore/net/SSLClientUtils.cc b/iocore/net/SSLClientUtils.cc
index 6c22946..7971b66 100644
--- a/iocore/net/SSLClientUtils.cc
+++ b/iocore/net/SSLClientUtils.cc
@@ -19,9 +19,9 @@
limitations under the License.
*/
-#include "ink_config.h"
+#include "ts/ink_config.h"
#include "records/I_RecHttp.h"
-#include "libts.h"
+#include "ts/libts.h"
#include "P_Net.h"
#include "P_SSLClientUtils.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/iocore/net/SSLConfig.cc
----------------------------------------------------------------------
diff --git a/iocore/net/SSLConfig.cc b/iocore/net/SSLConfig.cc
index a4d7a7f..611d757 100644
--- a/iocore/net/SSLConfig.cc
+++ b/iocore/net/SSLConfig.cc
@@ -29,8 +29,8 @@
SSL Configurations
****************************************************************************/
-#include "libts.h"
-#include "I_Layout.h"
+#include "ts/libts.h"
+#include "ts/I_Layout.h"
#include <string.h>
#include "P_Net.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/iocore/net/SSLDynlock.cc
----------------------------------------------------------------------
diff --git a/iocore/net/SSLDynlock.cc b/iocore/net/SSLDynlock.cc
index 4d75efc..1ce9aa8 100644
--- a/iocore/net/SSLDynlock.cc
+++ b/iocore/net/SSLDynlock.cc
@@ -19,7 +19,7 @@
limitations under the License.
*/
-#include "libts.h"
+#include "ts/libts.h"
struct CRYPTO_dynlock_value {
CRYPTO_dynlock_value(const char *f, int l) : file(f), line(l) { pthread_mutex_init(&mutex, NULL); }
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/iocore/net/SSLInternal.cc
----------------------------------------------------------------------
diff --git a/iocore/net/SSLInternal.cc b/iocore/net/SSLInternal.cc
index ddfa36e..deaf70e 100644
--- a/iocore/net/SSLInternal.cc
+++ b/iocore/net/SSLInternal.cc
@@ -21,7 +21,7 @@
See the License for the specific language governing permissions and
limitations under the License.
*/
-#include <ink_config.h>
+#include "ts/ink_config.h"
#if TS_USE_SET_RBIO
// No need to do anything, this version of openssl provides the SSL_set_rbio function
#else
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/iocore/net/SSLNetAccept.cc
----------------------------------------------------------------------
diff --git a/iocore/net/SSLNetAccept.cc b/iocore/net/SSLNetAccept.cc
index 675e0a9..1b17ad3 100644
--- a/iocore/net/SSLNetAccept.cc
+++ b/iocore/net/SSLNetAccept.cc
@@ -19,7 +19,7 @@
limitations under the License.
*/
-#include "ink_config.h"
+#include "ts/ink_config.h"
#include "P_Net.h"
typedef int (SSLNetAccept::*SSLNetAcceptHandler)(int, void *);
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/iocore/net/SSLNetProcessor.cc
----------------------------------------------------------------------
diff --git a/iocore/net/SSLNetProcessor.cc b/iocore/net/SSLNetProcessor.cc
index 3e579cf..a79f374 100644
--- a/iocore/net/SSLNetProcessor.cc
+++ b/iocore/net/SSLNetProcessor.cc
@@ -19,10 +19,10 @@
limitations under the License.
*/
-#include "ink_config.h"
+#include "ts/ink_config.h"
#include "P_Net.h"
-#include "I_Layout.h"
+#include "ts/I_Layout.h"
#include "I_RecHttp.h"
#include "P_SSLUtils.h"
#include "P_OCSPStapling.h"
[2/7] trafficserver git commit: TS-3759 Eliminate -Ilib/ts,
checkpoint 2
Posted by zw...@apache.org.
TS-3759 Eliminate -Ilib/ts, checkpoint 2
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/e568bb32
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/e568bb32
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/e568bb32
Branch: refs/heads/master
Commit: e568bb32675f604b735f5ca474a8e509e44dd4aa
Parents: 23ce693
Author: Leif Hedstrom <zw...@apache.org>
Authored: Tue Jul 14 13:52:05 2015 -0600
Committer: Leif Hedstrom <zw...@apache.org>
Committed: Thu Jul 16 14:25:32 2015 -0600
----------------------------------------------------------------------
ci/jenkins/bin/in_tree.sh | 3 +--
ci/jenkins/bin/out_of_tree.sh | 6 +++++-
cmd/traffic_cop/traffic_cop.cc | 8 +++++++-
cmd/traffic_crashlog/traffic_crashlog.cc | 1 +
cmd/traffic_crashlog/traffic_crashlog.h | 5 ++++-
cmd/traffic_ctl/traffic_ctl.h | 5 ++++-
cmd/traffic_layout/traffic_layout.cc | 2 +-
cmd/traffic_line/traffic_line.cc | 4 ++--
cmd/traffic_manager/MgmtHandlers.cc | 3 ++-
cmd/traffic_manager/StatProcessor.cc | 3 ++-
cmd/traffic_manager/WebOverview.cc | 4 ++--
cmd/traffic_via/traffic_via.cc | 3 +--
iocore/aio/I_AIO.h | 2 +-
iocore/cache/I_Cache.h | 2 +-
iocore/cache/I_CacheDefs.h | 2 ++
iocore/cache/I_Store.h | 2 +-
iocore/cache/P_Cache.h | 2 +-
iocore/cache/P_CacheInternal.h | 2 +-
iocore/cache/Store.cc | 2 +-
iocore/cluster/P_Cluster.h | 2 +-
iocore/dns/P_DNS.h | 2 +-
iocore/dns/P_DNSProcessor.h | 1 -
iocore/dns/SRV.h | 2 +-
iocore/dns/SplitDNS.cc | 2 +-
iocore/eventsystem/I_Action.h | 2 +-
iocore/eventsystem/I_Continuation.h | 3 ++-
iocore/eventsystem/I_EThread.h | 4 +++-
iocore/eventsystem/I_Event.h | 2 +-
iocore/eventsystem/I_EventProcessor.h | 2 +-
iocore/eventsystem/I_EventSystem.h | 2 +-
iocore/eventsystem/I_IOBuffer.h | 6 +++++-
iocore/eventsystem/I_Lock.h | 2 +-
iocore/eventsystem/I_PriorityEventQueue.h | 2 +-
iocore/eventsystem/I_Processor.h | 2 +-
iocore/eventsystem/I_ProtectedQueue.h | 2 +-
iocore/eventsystem/I_ProxyAllocator.h | 2 +-
iocore/eventsystem/I_SocketManager.h | 2 +-
iocore/eventsystem/I_Thread.h | 3 ++-
iocore/eventsystem/I_VConnection.h | 2 +-
iocore/eventsystem/I_VIO.h | 2 +-
iocore/eventsystem/P_EventSystem.h | 2 +-
iocore/eventsystem/P_Freer.h | 2 +-
iocore/eventsystem/P_IOBuffer.h | 2 +-
iocore/eventsystem/P_UnixEventProcessor.h | 2 ++
iocore/eventsystem/SocketManager.cc | 2 +-
iocore/eventsystem/test_Buffer.cc | 1 +
iocore/hostdb/I_HostDBProcessor.h | 5 +++++
iocore/hostdb/MultiCache.cc | 2 +-
iocore/hostdb/P_HostDB.h | 2 +-
iocore/net/Connection.cc | 2 +-
iocore/net/I_NetVConnection.h | 1 +
iocore/net/P_Connection.h | 2 +-
iocore/net/P_Net.h | 2 +-
iocore/net/P_NetAccept.h | 2 +-
iocore/net/P_NetVCTest.h | 2 +-
iocore/net/P_SSLNetAccept.h | 2 +-
iocore/net/P_SSLNetProcessor.h | 2 +-
iocore/net/P_SSLNetVConnection.h | 2 +-
iocore/net/P_UnixNet.h | 2 +-
iocore/net/P_UnixPollDescriptor.h | 2 +-
iocore/net/SSLClientUtils.cc | 2 +-
iocore/net/SSLConfig.cc | 2 +-
iocore/net/SSLDynlock.cc | 7 ++++++-
iocore/net/SSLNextProtocolSet.cc | 2 +-
iocore/net/SSLSessionCache.h | 2 +-
iocore/net/SSLUtils.cc | 2 +-
iocore/net/UnixNetPages.cc | 2 +-
iocore/net/UnixNetVConnection.cc | 2 +-
iocore/net/test_P_UDPNet.cc | 2 +-
iocore/utils/Machine.cc | 5 ++++-
lib/records/P_RecCore.cc | 3 ++-
lib/records/RecConfigParse.cc | 3 ++-
lib/records/RecCore.cc | 4 +++-
lib/records/RecFile.cc | 3 ++-
lib/records/RecLocal.cc | 2 +-
lib/records/RecMessage.cc | 4 +++-
lib/records/RecProcess.cc | 2 +-
lib/records/RecUtils.cc | 4 +++-
lib/ts/Arena.cc | 6 ++++--
lib/ts/CryptoHash.h | 9 ++++++---
lib/ts/HostLookup.cc | 8 +++++++-
lib/ts/Layout.cc | 6 +++++-
lib/ts/MatcherUtils.cc | 8 +++++++-
lib/ts/MimeTable.cc | 3 ++-
lib/ts/ParseRules.cc | 3 ++-
lib/ts/Regex.cc | 4 +++-
lib/ts/Regression.h | 2 +-
lib/ts/TextBuffer.cc | 3 ++-
lib/ts/Version.cc | 4 +++-
lib/ts/ink_args.cc | 8 +++++++-
lib/ts/ink_base64.cc | 3 ++-
lib/ts/ink_defs.cc | 2 +-
lib/ts/ink_error.cc | 2 +-
lib/ts/ink_inet.cc | 7 ++++++-
lib/ts/ink_memory.cc | 6 +++++-
lib/ts/ink_sock.cc | 5 ++++-
lib/ts/ink_string++.cc | 6 +++++-
lib/ts/ink_string.cc | 3 ++-
lib/ts/ink_thread.cc | 3 ++-
lib/ts/signals.cc | 5 ++++-
lib/ts/test_X509HostnameValidator.cc | 4 ++++
lib/ts/test_geometry.cc | 3 ++-
102 files changed, 215 insertions(+), 102 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/e568bb32/ci/jenkins/bin/in_tree.sh
----------------------------------------------------------------------
diff --git a/ci/jenkins/bin/in_tree.sh b/ci/jenkins/bin/in_tree.sh
index 1c78fbd..2b16d42 100755
--- a/ci/jenkins/bin/in_tree.sh
+++ b/ci/jenkins/bin/in_tree.sh
@@ -32,8 +32,7 @@ autoreconf -fi
--enable-example-plugins \
--enable-test-tools \
--enable-wccp \
- ${enable_cppapi} \
- CORES=2
+ ${enable_cppapi}
${ATS_MAKE} -j5 V=1
#${ATS_MAKE} check VERBOSE=Y
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/e568bb32/ci/jenkins/bin/out_of_tree.sh
----------------------------------------------------------------------
diff --git a/ci/jenkins/bin/out_of_tree.sh b/ci/jenkins/bin/out_of_tree.sh
index f7e09c0..d07f8db 100755
--- a/ci/jenkins/bin/out_of_tree.sh
+++ b/ci/jenkins/bin/out_of_tree.sh
@@ -18,6 +18,10 @@
# This does intentionally not run the regressions, it's primarily a "build" test
+# Test if we should enable CPPAPI (only 5.0 and later for now)
+enable_cppapi="--enable-cppapi"
+test "${JOB_NAME#*-6.0.x}" == "${JOB_NAME}" && enable_cppapi=""
+
cd "${WORKSPACE}/src"
autoreconf -fi
@@ -29,7 +33,7 @@ mkdir -p BUILDS && cd BUILDS
--enable-example-plugins \
--enable-test-tools \
--enable-wccp \
- CORES=2
+ ${enable_cppapi}
${ATS_MAKE} -j5 V=1
#${ATS_MAKE} check VERBOSE=Y
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/e568bb32/cmd/traffic_cop/traffic_cop.cc
----------------------------------------------------------------------
diff --git a/cmd/traffic_cop/traffic_cop.cc b/cmd/traffic_cop/traffic_cop.cc
index dc275f1..7102f58 100644
--- a/cmd/traffic_cop/traffic_cop.cc
+++ b/cmd/traffic_cop/traffic_cop.cc
@@ -21,7 +21,13 @@
limitations under the License.
*/
-#include "ts/libts.h"
+#include "ts/ink_platform.h"
+#include "ts/ink_syslog.h"
+#include "ts/ink_stack_trace.h"
+#include "ts/ink_lockfile.h"
+#include "ts/ink_sock.h"
+#include "ts/ink_args.h"
+#include "ts/ink_file.h"
#include "ts/I_Layout.h"
#include "ts/I_Version.h"
#include "I_RecCore.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/e568bb32/cmd/traffic_crashlog/traffic_crashlog.cc
----------------------------------------------------------------------
diff --git a/cmd/traffic_crashlog/traffic_crashlog.cc b/cmd/traffic_crashlog/traffic_crashlog.cc
index 9c9e13c..c176a47 100644
--- a/cmd/traffic_crashlog/traffic_crashlog.cc
+++ b/cmd/traffic_crashlog/traffic_crashlog.cc
@@ -26,6 +26,7 @@
#include "ts/ink_cap.h"
#include "ts/I_Version.h"
#include "ts/I_Layout.h"
+#include "ts/ink_syslog.h"
#include "I_RecProcess.h"
#include "RecordsConfig.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/e568bb32/cmd/traffic_crashlog/traffic_crashlog.h
----------------------------------------------------------------------
diff --git a/cmd/traffic_crashlog/traffic_crashlog.h b/cmd/traffic_crashlog/traffic_crashlog.h
index e5e6e5a..12db3c0 100644
--- a/cmd/traffic_crashlog/traffic_crashlog.h
+++ b/cmd/traffic_crashlog/traffic_crashlog.h
@@ -24,7 +24,10 @@
#ifndef __TRAFFIC_CRASHLOG_H__
#define __TRAFFIC_CRASHLOG_H__
-#include "ts/libts.h"
+#include "ts/ink_platform.h"
+#include "ts/ink_memory.h"
+#include "ts/Diags.h"
+#include "ts/TextBuffer.h"
#include "mgmtapi.h"
// ucontext.h is deprecated on Darwin, and we really only need it on Linux, so only
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/e568bb32/cmd/traffic_ctl/traffic_ctl.h
----------------------------------------------------------------------
diff --git a/cmd/traffic_ctl/traffic_ctl.h b/cmd/traffic_ctl/traffic_ctl.h
index 5273e2b..aa1a51e 100644
--- a/cmd/traffic_ctl/traffic_ctl.h
+++ b/cmd/traffic_ctl/traffic_ctl.h
@@ -24,12 +24,15 @@
#ifndef _TRAFFIC_CTRL_H_
#define _TRAFFIC_CTRL_H_
-#include "ts/libts.h"
+#include "ts/ink_platform.h"
+#include "ts/Diags.h"
+#include "ts/ink_memory.h"
#include "mgmtapi.h"
#include "ts/ink_args.h"
#include "ts/I_Version.h"
#include <vector>
+#include <string>
struct subcommand {
int (*handler)(unsigned, const char **);
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/e568bb32/cmd/traffic_layout/traffic_layout.cc
----------------------------------------------------------------------
diff --git a/cmd/traffic_layout/traffic_layout.cc b/cmd/traffic_layout/traffic_layout.cc
index 1f73e8d..efa166c 100644
--- a/cmd/traffic_layout/traffic_layout.cc
+++ b/cmd/traffic_layout/traffic_layout.cc
@@ -21,7 +21,7 @@
limitations under the License.
*/
-#include "ts/libts.h"
+#include "ts/ink_platform.h"
#include "ts/ink_args.h"
#include "ts/ink_config.h"
#include "ts/I_Version.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/e568bb32/cmd/traffic_line/traffic_line.cc
----------------------------------------------------------------------
diff --git a/cmd/traffic_line/traffic_line.cc b/cmd/traffic_line/traffic_line.cc
index 975de65..a0194ad 100644
--- a/cmd/traffic_line/traffic_line.cc
+++ b/cmd/traffic_line/traffic_line.cc
@@ -21,8 +21,8 @@
limitations under the License.
*/
-#include "ts/libts.h"
-
+#include "ts/ink_platform.h"
+#include "ts/ink_memory.h"
#include "ts/ink_args.h"
#include "ts/I_Version.h"
#include "ts/Tokenizer.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/e568bb32/cmd/traffic_manager/MgmtHandlers.cc
----------------------------------------------------------------------
diff --git a/cmd/traffic_manager/MgmtHandlers.cc b/cmd/traffic_manager/MgmtHandlers.cc
index fe9bef2..a7f44ce 100644
--- a/cmd/traffic_manager/MgmtHandlers.cc
+++ b/cmd/traffic_manager/MgmtHandlers.cc
@@ -27,7 +27,8 @@
*
****************************************************************************/
-#include "ts/libts.h"
+#include "ts/ink_platform.h"
+#include "ts/ink_sock.h"
#include "ts/I_Layout.h"
#include "LocalManager.h"
#include "Alarms.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/e568bb32/cmd/traffic_manager/StatProcessor.cc
----------------------------------------------------------------------
diff --git a/cmd/traffic_manager/StatProcessor.cc b/cmd/traffic_manager/StatProcessor.cc
index 2784928..0e1c84e 100644
--- a/cmd/traffic_manager/StatProcessor.cc
+++ b/cmd/traffic_manager/StatProcessor.cc
@@ -30,7 +30,8 @@
*
****************************************************************************/
-#include "ts/libts.h"
+#include "ts/ink_platform.h"
+#include "ts/ink_string.h"
#include "StatProcessor.h"
#include "FileManager.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/e568bb32/cmd/traffic_manager/WebOverview.cc
----------------------------------------------------------------------
diff --git a/cmd/traffic_manager/WebOverview.cc b/cmd/traffic_manager/WebOverview.cc
index b321b1c..ffa6b85 100644
--- a/cmd/traffic_manager/WebOverview.cc
+++ b/cmd/traffic_manager/WebOverview.cc
@@ -28,8 +28,8 @@
*
****************************************************************************/
-#include "ts/libts.h"
-
+#include "ts/ink_platform.h"
+#include "ts/ink_string.h"
#include "MgmtDefs.h"
#include "WebOverview.h"
#include "WebMgmtUtils.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/e568bb32/cmd/traffic_via/traffic_via.cc
----------------------------------------------------------------------
diff --git a/cmd/traffic_via/traffic_via.cc b/cmd/traffic_via/traffic_via.cc
index b329704..3c28f00 100644
--- a/cmd/traffic_via/traffic_via.cc
+++ b/cmd/traffic_via/traffic_via.cc
@@ -21,8 +21,7 @@
limitations under the License.
*/
-#include "ts/libts.h"
-
+#include "ts/ink_platform.h"
#include "ts/ink_args.h"
#include "ts/I_Version.h"
#include "ts/Tokenizer.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/e568bb32/iocore/aio/I_AIO.h
----------------------------------------------------------------------
diff --git a/iocore/aio/I_AIO.h b/iocore/aio/I_AIO.h
index ea765d2..c685d3c 100644
--- a/iocore/aio/I_AIO.h
+++ b/iocore/aio/I_AIO.h
@@ -31,7 +31,7 @@
#if !defined(_I_AIO_h_)
#define _I_AIO_h_
-#include "ts/libts.h"
+#include "ts/ink_platform.h"
#include "I_EventSystem.h"
#include "I_RecProcess.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/e568bb32/iocore/cache/I_Cache.h
----------------------------------------------------------------------
diff --git a/iocore/cache/I_Cache.h b/iocore/cache/I_Cache.h
index e41eecb..ecd5db4 100644
--- a/iocore/cache/I_Cache.h
+++ b/iocore/cache/I_Cache.h
@@ -24,7 +24,7 @@
#ifndef _I_CACHE_H__
#define _I_CACHE_H__
-#include "ts/libts.h"
+#include "ts/ink_platform.h"
#include "I_EventSystem.h"
#include "I_AIO.h"
#include "I_CacheDefs.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/e568bb32/iocore/cache/I_CacheDefs.h
----------------------------------------------------------------------
diff --git a/iocore/cache/I_CacheDefs.h b/iocore/cache/I_CacheDefs.h
index 941ff0e..af12ec9 100644
--- a/iocore/cache/I_CacheDefs.h
+++ b/iocore/cache/I_CacheDefs.h
@@ -25,6 +25,8 @@
#ifndef _I_CACHE_DEFS_H__
#define _I_CACHE_DEFS_H__
+#include "ts/CryptoHash.h"
+
#define CACHE_INIT_FAILED -1
#define CACHE_INITIALIZING 0
#define CACHE_INITIALIZED 1
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/e568bb32/iocore/cache/I_Store.h
----------------------------------------------------------------------
diff --git a/iocore/cache/I_Store.h b/iocore/cache/I_Store.h
index 800bddd..7fed57b 100644
--- a/iocore/cache/I_Store.h
+++ b/iocore/cache/I_Store.h
@@ -31,7 +31,7 @@
#ifndef _Store_h_
#define _Store_h_
-#include "ts/libts.h"
+#include "ts/ink_platform.h"
#define STORE_BLOCK_SIZE 8192
#define STORE_BLOCK_SHIFT 13
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/e568bb32/iocore/cache/P_Cache.h
----------------------------------------------------------------------
diff --git a/iocore/cache/P_Cache.h b/iocore/cache/P_Cache.h
index def4bf0..cab0f90 100644
--- a/iocore/cache/P_Cache.h
+++ b/iocore/cache/P_Cache.h
@@ -24,7 +24,7 @@
#ifndef _P_CACHE_H__
#define _P_CACHE_H__
-#include "ts/libts.h"
+#include "ts/ink_platform.h"
#include "P_EventSystem.h"
#include "P_AIO.h"
#include "I_RecProcess.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/e568bb32/iocore/cache/P_CacheInternal.h
----------------------------------------------------------------------
diff --git a/iocore/cache/P_CacheInternal.h b/iocore/cache/P_CacheInternal.h
index c607466..e576c5f 100644
--- a/iocore/cache/P_CacheInternal.h
+++ b/iocore/cache/P_CacheInternal.h
@@ -25,7 +25,7 @@
#ifndef _P_CACHE_INTERNAL_H__
#define _P_CACHE_INTERNAL_H__
-#include "ts/libts.h"
+#include "ts/ink_platform.h"
#ifdef HTTP_CACHE
#include "HTTP.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/e568bb32/iocore/cache/Store.cc
----------------------------------------------------------------------
diff --git a/iocore/cache/Store.cc b/iocore/cache/Store.cc
index 0ca6e84..379eb04 100644
--- a/iocore/cache/Store.cc
+++ b/iocore/cache/Store.cc
@@ -21,7 +21,7 @@
limitations under the License.
*/
-#include "ts/libts.h"
+#include "ts/ink_platform.h"
#include "P_Cache.h"
#include "ts/I_Layout.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/e568bb32/iocore/cluster/P_Cluster.h
----------------------------------------------------------------------
diff --git a/iocore/cluster/P_Cluster.h b/iocore/cluster/P_Cluster.h
index 7b6d1fe..555064a 100644
--- a/iocore/cluster/P_Cluster.h
+++ b/iocore/cluster/P_Cluster.h
@@ -24,7 +24,7 @@
#ifndef _P_CLUSTER_H__
#define _P_CLUSTER_H__
-#include "ts/libts.h"
+#include "ts/ink_platform.h"
#include "P_EventSystem.h"
#include "I_RecProcess.h"
#include "P_Net.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/e568bb32/iocore/dns/P_DNS.h
----------------------------------------------------------------------
diff --git a/iocore/dns/P_DNS.h b/iocore/dns/P_DNS.h
index e84f8a9..941b248 100644
--- a/iocore/dns/P_DNS.h
+++ b/iocore/dns/P_DNS.h
@@ -30,7 +30,7 @@
#if !defined(_P_DNS_h_)
#define _P_DNS_h_
-#include "ts/libts.h"
+#include "ts/ink_platform.h"
#include "I_DNS.h"
#include "P_EventSystem.h"
#include "I_Cache.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/e568bb32/iocore/dns/P_DNSProcessor.h
----------------------------------------------------------------------
diff --git a/iocore/dns/P_DNSProcessor.h b/iocore/dns/P_DNSProcessor.h
index b72f152..1705457 100644
--- a/iocore/dns/P_DNSProcessor.h
+++ b/iocore/dns/P_DNSProcessor.h
@@ -26,7 +26,6 @@
/*
#include "I_DNS.h"
- #include "ts/libts.h"
#include <arpa/nameser.h>
#include "I_Cache.h"
#include "P_Net.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/e568bb32/iocore/dns/SRV.h
----------------------------------------------------------------------
diff --git a/iocore/dns/SRV.h b/iocore/dns/SRV.h
index 3329c1d..1c71965 100644
--- a/iocore/dns/SRV.h
+++ b/iocore/dns/SRV.h
@@ -24,7 +24,7 @@
#ifndef _SRV_h_
#define _SRV_h_
-#include "ts/libts.h"
+#include "ts/ink_platform.h"
#include "I_HostDBProcessor.h"
struct HostDBInfo;
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/e568bb32/iocore/dns/SplitDNS.cc
----------------------------------------------------------------------
diff --git a/iocore/dns/SplitDNS.cc b/iocore/dns/SplitDNS.cc
index f8b4b61..ca88de6 100644
--- a/iocore/dns/SplitDNS.cc
+++ b/iocore/dns/SplitDNS.cc
@@ -28,7 +28,7 @@
*
****************************************************************************/
-#include "ts/libts.h"
+#include "ts/ink_platform.h"
#ifdef SPLIT_DNS
#include <sys/types.h>
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/e568bb32/iocore/eventsystem/I_Action.h
----------------------------------------------------------------------
diff --git a/iocore/eventsystem/I_Action.h b/iocore/eventsystem/I_Action.h
index 2987acb..ca3c5af 100644
--- a/iocore/eventsystem/I_Action.h
+++ b/iocore/eventsystem/I_Action.h
@@ -25,7 +25,7 @@
#ifndef _I_Action_h_
#define _I_Action_h_
-#include "ts/libts.h"
+#include "ts/ink_platform.h"
#include "I_Thread.h"
#include "I_Continuation.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/e568bb32/iocore/eventsystem/I_Continuation.h
----------------------------------------------------------------------
diff --git a/iocore/eventsystem/I_Continuation.h b/iocore/eventsystem/I_Continuation.h
index 2015861..a6c4cd7 100644
--- a/iocore/eventsystem/I_Continuation.h
+++ b/iocore/eventsystem/I_Continuation.h
@@ -36,7 +36,8 @@
#ifndef _I_Continuation_h_
#define _I_Continuation_h_
-#include "ts/libts.h"
+#include "ts/ink_platform.h"
+#include "ts/List.h"
#include "I_Lock.h"
class Continuation;
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/e568bb32/iocore/eventsystem/I_EThread.h
----------------------------------------------------------------------
diff --git a/iocore/eventsystem/I_EThread.h b/iocore/eventsystem/I_EThread.h
index 3e7bed2..c348217 100644
--- a/iocore/eventsystem/I_EThread.h
+++ b/iocore/eventsystem/I_EThread.h
@@ -25,7 +25,9 @@
#ifndef _EThread_h_
#define _EThread_h_
-#include "ts/libts.h"
+#include "ts/ink_platform.h"
+#include "ts/ink_rand.h"
+#include "ts/I_Version.h"
#include "I_Thread.h"
#include "I_PriorityEventQueue.h"
#include "I_ProtectedQueue.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/e568bb32/iocore/eventsystem/I_Event.h
----------------------------------------------------------------------
diff --git a/iocore/eventsystem/I_Event.h b/iocore/eventsystem/I_Event.h
index dc032dc..a61c49c 100644
--- a/iocore/eventsystem/I_Event.h
+++ b/iocore/eventsystem/I_Event.h
@@ -25,7 +25,7 @@
#ifndef _Event_h_
#define _Event_h_
-#include "ts/libts.h"
+#include "ts/ink_platform.h"
#include "I_Action.h"
//
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/e568bb32/iocore/eventsystem/I_EventProcessor.h
----------------------------------------------------------------------
diff --git a/iocore/eventsystem/I_EventProcessor.h b/iocore/eventsystem/I_EventProcessor.h
index 45f9f2d..70fe8c2 100644
--- a/iocore/eventsystem/I_EventProcessor.h
+++ b/iocore/eventsystem/I_EventProcessor.h
@@ -24,7 +24,7 @@
#ifndef _I_EventProcessor_h_
#define _I_EventProcessor_h_
-#include "ts/libts.h"
+#include "ts/ink_platform.h"
#include "I_Continuation.h"
#include "I_Processor.h"
#include "I_Event.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/e568bb32/iocore/eventsystem/I_EventSystem.h
----------------------------------------------------------------------
diff --git a/iocore/eventsystem/I_EventSystem.h b/iocore/eventsystem/I_EventSystem.h
index 9696890..fa22471 100644
--- a/iocore/eventsystem/I_EventSystem.h
+++ b/iocore/eventsystem/I_EventSystem.h
@@ -25,7 +25,7 @@
#ifndef _I_EventSystem_h
#define _I_EventSystem_h
-#include "ts/libts.h"
+#include "ts/ink_platform.h"
#include "I_IOBuffer.h"
#include "I_Action.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/e568bb32/iocore/eventsystem/I_IOBuffer.h
----------------------------------------------------------------------
diff --git a/iocore/eventsystem/I_IOBuffer.h b/iocore/eventsystem/I_IOBuffer.h
index 4037c99..a0e43d8 100644
--- a/iocore/eventsystem/I_IOBuffer.h
+++ b/iocore/eventsystem/I_IOBuffer.h
@@ -39,7 +39,11 @@
#if !defined(I_IOBuffer_h)
#define I_IOBuffer_h
-#include "ts/libts.h"
+#include "ts/ink_platform.h"
+#include "ts/ink_apidefs.h"
+#include "ts/Allocator.h"
+#include "ts/Ptr.h"
+#include "ts/ink_assert.h"
#include "ts/ink_resource.h"
struct MIOBufferAccessor;
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/e568bb32/iocore/eventsystem/I_Lock.h
----------------------------------------------------------------------
diff --git a/iocore/eventsystem/I_Lock.h b/iocore/eventsystem/I_Lock.h
index 46e8cc2..f8dc670 100644
--- a/iocore/eventsystem/I_Lock.h
+++ b/iocore/eventsystem/I_Lock.h
@@ -24,7 +24,7 @@
#ifndef _I_Lock_h_
#define _I_Lock_h_
-#include "ts/libts.h"
+#include "ts/ink_platform.h"
#include "I_Thread.h"
#define MAX_LOCK_TIME HRTIME_MSECONDS(200)
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/e568bb32/iocore/eventsystem/I_PriorityEventQueue.h
----------------------------------------------------------------------
diff --git a/iocore/eventsystem/I_PriorityEventQueue.h b/iocore/eventsystem/I_PriorityEventQueue.h
index 69c7907..90dc449 100644
--- a/iocore/eventsystem/I_PriorityEventQueue.h
+++ b/iocore/eventsystem/I_PriorityEventQueue.h
@@ -24,7 +24,7 @@
#ifndef _I_PriorityEventQueue_h_
#define _I_PriorityEventQueue_h_
-#include "ts/libts.h"
+#include "ts/ink_platform.h"
#include "I_Event.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/e568bb32/iocore/eventsystem/I_Processor.h
----------------------------------------------------------------------
diff --git a/iocore/eventsystem/I_Processor.h b/iocore/eventsystem/I_Processor.h
index ccea5da..f5fb2b8 100644
--- a/iocore/eventsystem/I_Processor.h
+++ b/iocore/eventsystem/I_Processor.h
@@ -25,7 +25,7 @@
#ifndef _I_Processor_h_
#define _I_Processor_h_
-#include "ts/libts.h"
+#include "ts/ink_platform.h"
#define PROCESSOR_RECONFIGURE 0x01
#define PROCESSOR_CHECK 0x02
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/e568bb32/iocore/eventsystem/I_ProtectedQueue.h
----------------------------------------------------------------------
diff --git a/iocore/eventsystem/I_ProtectedQueue.h b/iocore/eventsystem/I_ProtectedQueue.h
index 2f18991..7dfba98 100644
--- a/iocore/eventsystem/I_ProtectedQueue.h
+++ b/iocore/eventsystem/I_ProtectedQueue.h
@@ -35,7 +35,7 @@
#ifndef _I_ProtectedQueue_h_
#define _I_ProtectedQueue_h_
-#include "ts/libts.h"
+#include "ts/ink_platform.h"
#include "I_Event.h"
struct ProtectedQueue {
void enqueue(Event *e, bool fast_signal = false);
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/e568bb32/iocore/eventsystem/I_ProxyAllocator.h
----------------------------------------------------------------------
diff --git a/iocore/eventsystem/I_ProxyAllocator.h b/iocore/eventsystem/I_ProxyAllocator.h
index fe75be4..58a636d 100644
--- a/iocore/eventsystem/I_ProxyAllocator.h
+++ b/iocore/eventsystem/I_ProxyAllocator.h
@@ -31,7 +31,7 @@
#ifndef _I_ProxyAllocator_h_
#define _I_ProxyAllocator_h_
-#include "ts/libts.h"
+#include "ts/ink_platform.h"
class EThread;
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/e568bb32/iocore/eventsystem/I_SocketManager.h
----------------------------------------------------------------------
diff --git a/iocore/eventsystem/I_SocketManager.h b/iocore/eventsystem/I_SocketManager.h
index 2e0e4c1..1a515ce 100644
--- a/iocore/eventsystem/I_SocketManager.h
+++ b/iocore/eventsystem/I_SocketManager.h
@@ -33,7 +33,7 @@
#ifndef _I_SocketManager_h_
#define _I_SocketManager_h_
-#include "ts/libts.h"
+#include "ts/ink_platform.h"
#include "I_EventSystem.h"
#include "I_Thread.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/e568bb32/iocore/eventsystem/I_Thread.h
----------------------------------------------------------------------
diff --git a/iocore/eventsystem/I_Thread.h b/iocore/eventsystem/I_Thread.h
index dc5ba12..7d3e74c 100644
--- a/iocore/eventsystem/I_Thread.h
+++ b/iocore/eventsystem/I_Thread.h
@@ -64,7 +64,8 @@
-- - include I_Event.h or
P_Event.h
#endif
-#include "ts/libts.h"
+#include "ts/ink_platform.h"
+#include "ts/ink_thread.h"
#include "I_ProxyAllocator.h"
class Thread;
class ProxyMutex;
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/e568bb32/iocore/eventsystem/I_VConnection.h
----------------------------------------------------------------------
diff --git a/iocore/eventsystem/I_VConnection.h b/iocore/eventsystem/I_VConnection.h
index ef7a628..effdc5a 100644
--- a/iocore/eventsystem/I_VConnection.h
+++ b/iocore/eventsystem/I_VConnection.h
@@ -25,7 +25,7 @@
#if !defined(_I_VConnection_h_)
#define _I_VConnection_h_
-#include "ts/libts.h"
+#include "ts/ink_platform.h"
#include "I_EventSystem.h"
#if !defined(I_VIO_h)
#error "include I_VIO.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/e568bb32/iocore/eventsystem/I_VIO.h
----------------------------------------------------------------------
diff --git a/iocore/eventsystem/I_VIO.h b/iocore/eventsystem/I_VIO.h
index b5a2197..38b82d7 100644
--- a/iocore/eventsystem/I_VIO.h
+++ b/iocore/eventsystem/I_VIO.h
@@ -25,7 +25,7 @@
#if !defined(I_VIO_h)
#define I_VIO_h
-#include "ts/libts.h"
+#include "ts/ink_platform.h"
#include "I_EventSystem.h"
#if !defined(I_IOBuffer_h)
#error "include I_IOBuffer.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/e568bb32/iocore/eventsystem/P_EventSystem.h
----------------------------------------------------------------------
diff --git a/iocore/eventsystem/P_EventSystem.h b/iocore/eventsystem/P_EventSystem.h
index d24e053..c23d584 100644
--- a/iocore/eventsystem/P_EventSystem.h
+++ b/iocore/eventsystem/P_EventSystem.h
@@ -31,7 +31,7 @@
#ifndef _P_EventSystem_h
#define _P_EventSystem_h
-#include "ts/libts.h"
+#include "ts/ink_platform.h"
#include "I_EventSystem.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/e568bb32/iocore/eventsystem/P_Freer.h
----------------------------------------------------------------------
diff --git a/iocore/eventsystem/P_Freer.h b/iocore/eventsystem/P_Freer.h
index f48afd0..b9d17ea 100644
--- a/iocore/eventsystem/P_Freer.h
+++ b/iocore/eventsystem/P_Freer.h
@@ -24,7 +24,7 @@
#if !defined(_P_Freer_h_)
#define _P_Freer_h_
-#include "ts/libts.h"
+#include "ts/ink_platform.h"
#include "I_Tasks.h"
// Note that these should not be used for memory that wishes to retain
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/e568bb32/iocore/eventsystem/P_IOBuffer.h
----------------------------------------------------------------------
diff --git a/iocore/eventsystem/P_IOBuffer.h b/iocore/eventsystem/P_IOBuffer.h
index 7af9cdb..1b1cd76 100644
--- a/iocore/eventsystem/P_IOBuffer.h
+++ b/iocore/eventsystem/P_IOBuffer.h
@@ -25,7 +25,7 @@
#if !defined(_P_IOBuffer_h)
#define _P_IOBuffer_h
-#include "ts/libts.h"
+#include "ts/ink_platform.h"
#include "ts/ink_resource.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/e568bb32/iocore/eventsystem/P_UnixEventProcessor.h
----------------------------------------------------------------------
diff --git a/iocore/eventsystem/P_UnixEventProcessor.h b/iocore/eventsystem/P_UnixEventProcessor.h
index d8d0feb..55bf4a8 100644
--- a/iocore/eventsystem/P_UnixEventProcessor.h
+++ b/iocore/eventsystem/P_UnixEventProcessor.h
@@ -23,6 +23,8 @@
#ifndef _P_UnixEventProcessor_h_
#define _P_UnixEventProcessor_h_
+
+#include "ts/ink_align.h"
#include "I_EventProcessor.h"
const int LOAD_BALANCE_INTERVAL = 1;
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/e568bb32/iocore/eventsystem/SocketManager.cc
----------------------------------------------------------------------
diff --git a/iocore/eventsystem/SocketManager.cc b/iocore/eventsystem/SocketManager.cc
index 80b2adc..dac6095 100644
--- a/iocore/eventsystem/SocketManager.cc
+++ b/iocore/eventsystem/SocketManager.cc
@@ -25,7 +25,7 @@
SocketManager.cc
****************************************************************************/
-#include "ts/libts.h"
+#include "ts/ink_platform.h"
#include "P_EventSystem.h"
SocketManager socketManager;
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/e568bb32/iocore/eventsystem/test_Buffer.cc
----------------------------------------------------------------------
diff --git a/iocore/eventsystem/test_Buffer.cc b/iocore/eventsystem/test_Buffer.cc
index 7465add..825c77e 100644
--- a/iocore/eventsystem/test_Buffer.cc
+++ b/iocore/eventsystem/test_Buffer.cc
@@ -23,6 +23,7 @@
#include "I_EventSystem.h"
#include "ts/I_Layout.h"
+#include "ts/ink_string.h"
#define TEST_TIME_SECOND 60
#define TEST_THREADS 2
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/e568bb32/iocore/hostdb/I_HostDBProcessor.h
----------------------------------------------------------------------
diff --git a/iocore/hostdb/I_HostDBProcessor.h b/iocore/hostdb/I_HostDBProcessor.h
index ffebfe4..abb0997 100644
--- a/iocore/hostdb/I_HostDBProcessor.h
+++ b/iocore/hostdb/I_HostDBProcessor.h
@@ -24,6 +24,11 @@
#ifndef _I_HostDBProcessor_h_
#define _I_HostDBProcessor_h_
+#include "ts/HashFNV.h"
+#include "ts/ink_time.h"
+#include "ts/INK_MD5.h"
+#include "ts/ink_align.h"
+#include "ts/ink_resolver.h"
#include "I_EventSystem.h"
#include "SRV.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/e568bb32/iocore/hostdb/MultiCache.cc
----------------------------------------------------------------------
diff --git a/iocore/hostdb/MultiCache.cc b/iocore/hostdb/MultiCache.cc
index ba5ae89..536338d 100644
--- a/iocore/hostdb/MultiCache.cc
+++ b/iocore/hostdb/MultiCache.cc
@@ -28,7 +28,7 @@
****************************************************************************/
-#include "ts/libts.h"
+#include "ts/ink_platform.h"
#include "ts/I_Layout.h"
#include "P_HostDB.h"
#include "P_MultiCache.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/e568bb32/iocore/hostdb/P_HostDB.h
----------------------------------------------------------------------
diff --git a/iocore/hostdb/P_HostDB.h b/iocore/hostdb/P_HostDB.h
index 8026cf5..248f4f7 100644
--- a/iocore/hostdb/P_HostDB.h
+++ b/iocore/hostdb/P_HostDB.h
@@ -31,7 +31,7 @@
#ifndef _P_HostDB_h_
#define _P_HostDB_h_
-#include "ts/libts.h"
+#include "ts/ink_platform.h"
#ifdef SPLIT_DNS
#include "P_SplitDNS.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/e568bb32/iocore/net/Connection.cc
----------------------------------------------------------------------
diff --git a/iocore/net/Connection.cc b/iocore/net/Connection.cc
index 4f90509..2a582ab 100644
--- a/iocore/net/Connection.cc
+++ b/iocore/net/Connection.cc
@@ -27,7 +27,7 @@
Commonality across all platforms -- move out as required.
**************************************************************************/
-#include "ts/libts.h"
+#include "ts/ink_platform.h"
#include "P_Net.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/e568bb32/iocore/net/I_NetVConnection.h
----------------------------------------------------------------------
diff --git a/iocore/net/I_NetVConnection.h b/iocore/net/I_NetVConnection.h
index 9940a30..39e8d4d 100644
--- a/iocore/net/I_NetVConnection.h
+++ b/iocore/net/I_NetVConnection.h
@@ -25,6 +25,7 @@
#ifndef __NETVCONNECTION_H__
#define __NETVCONNECTION_H__
+#include "ts/ink_inet.h"
#include "I_Action.h"
#include "I_VConnection.h"
#include "I_Event.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/e568bb32/iocore/net/P_Connection.h
----------------------------------------------------------------------
diff --git a/iocore/net/P_Connection.h b/iocore/net/P_Connection.h
index 8783f9b..a21c801 100644
--- a/iocore/net/P_Connection.h
+++ b/iocore/net/P_Connection.h
@@ -50,7 +50,7 @@
#ifndef __CONNECTION_H__
#define __CONNECTION_H__
-#include "ts/libts.h"
+#include "ts/ink_platform.h"
struct NetVCOptions;
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/e568bb32/iocore/net/P_Net.h
----------------------------------------------------------------------
diff --git a/iocore/net/P_Net.h b/iocore/net/P_Net.h
index 7d63499..69fe410 100644
--- a/iocore/net/P_Net.h
+++ b/iocore/net/P_Net.h
@@ -87,7 +87,7 @@ extern RecRawStatBlock *net_rsb;
#define NET_SUM_GLOBAL_DYN_STAT(_x, _r) RecIncrGlobalRawStatSum(net_rsb, (_x), (_r))
#define NET_READ_GLOBAL_DYN_SUM(_x, _sum) RecGetGlobalRawStatSum(net_rsb, _x, &_sum)
-#include "ts/libts.h"
+#include "ts/ink_platform.h"
#include "P_EventSystem.h"
#include "I_Net.h"
#include "P_NetVConnection.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/e568bb32/iocore/net/P_NetAccept.h
----------------------------------------------------------------------
diff --git a/iocore/net/P_NetAccept.h b/iocore/net/P_NetAccept.h
index 8e43164..d596003 100644
--- a/iocore/net/P_NetAccept.h
+++ b/iocore/net/P_NetAccept.h
@@ -39,7 +39,7 @@
#ifndef __P_NETACCEPT_H__
#define __P_NETACCEPT_H__
-#include "ts/libts.h"
+#include "ts/ink_platform.h"
#include "P_Connection.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/e568bb32/iocore/net/P_NetVCTest.h
----------------------------------------------------------------------
diff --git a/iocore/net/P_NetVCTest.h b/iocore/net/P_NetVCTest.h
index 855caf5..4677b3b 100644
--- a/iocore/net/P_NetVCTest.h
+++ b/iocore/net/P_NetVCTest.h
@@ -37,7 +37,7 @@
#ifndef _P_NET_VC_TEST_H_
#define _P_NET_VC_TEST_H_
-#include "ts/libts.h"
+#include "ts/ink_platform.h"
class VIO;
class MIOBuffer;
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/e568bb32/iocore/net/P_SSLNetAccept.h
----------------------------------------------------------------------
diff --git a/iocore/net/P_SSLNetAccept.h b/iocore/net/P_SSLNetAccept.h
index 7533564..ff8bbad 100644
--- a/iocore/net/P_SSLNetAccept.h
+++ b/iocore/net/P_SSLNetAccept.h
@@ -39,7 +39,7 @@
#if !defined(_SSLNetAccept_h_)
#define _SSLNetAccept_h_
-#include "ts/libts.h"
+#include "ts/ink_platform.h"
#include "P_Connection.h"
#include "P_NetAccept.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/e568bb32/iocore/net/P_SSLNetProcessor.h
----------------------------------------------------------------------
diff --git a/iocore/net/P_SSLNetProcessor.h b/iocore/net/P_SSLNetProcessor.h
index 89e09a1..a68bf80 100644
--- a/iocore/net/P_SSLNetProcessor.h
+++ b/iocore/net/P_SSLNetProcessor.h
@@ -32,7 +32,7 @@
#ifndef __P_SSLNETPROCESSOR_H
#define __P_SSLNETPROCESSOR_H
-#include "ts/libts.h"
+#include "ts/ink_platform.h"
#include "P_Net.h"
#include "P_SSLConfig.h"
#include <openssl/ssl.h>
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/e568bb32/iocore/net/P_SSLNetVConnection.h
----------------------------------------------------------------------
diff --git a/iocore/net/P_SSLNetVConnection.h b/iocore/net/P_SSLNetVConnection.h
index fd09a18..57c9a6b 100644
--- a/iocore/net/P_SSLNetVConnection.h
+++ b/iocore/net/P_SSLNetVConnection.h
@@ -32,7 +32,7 @@
#if !defined(_SSLNetVConnection_h_)
#define _SSLNetVConnection_h_
-#include "ts/libts.h"
+#include "ts/ink_platform.h"
#include "P_EventSystem.h"
#include "P_UnixNetVConnection.h"
#include "P_UnixNet.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/e568bb32/iocore/net/P_UnixNet.h
----------------------------------------------------------------------
diff --git a/iocore/net/P_UnixNet.h b/iocore/net/P_UnixNet.h
index 1363535..a92c73c 100644
--- a/iocore/net/P_UnixNet.h
+++ b/iocore/net/P_UnixNet.h
@@ -24,7 +24,7 @@
#ifndef __P_UNIXNET_H__
#define __P_UNIXNET_H__
-#include "ts/libts.h"
+#include "ts/ink_platform.h"
#define USE_EDGE_TRIGGER_EPOLL 1
#define USE_EDGE_TRIGGER_KQUEUE 1
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/e568bb32/iocore/net/P_UnixPollDescriptor.h
----------------------------------------------------------------------
diff --git a/iocore/net/P_UnixPollDescriptor.h b/iocore/net/P_UnixPollDescriptor.h
index d56213b..8a1c496 100644
--- a/iocore/net/P_UnixPollDescriptor.h
+++ b/iocore/net/P_UnixPollDescriptor.h
@@ -30,7 +30,7 @@
#ifndef __P_UNIXPOLLDESCRIPTOR_H__
#define __P_UNIXPOLLDESCRIPTOR_H__
-#include "ts/libts.h"
+#include "ts/ink_platform.h"
#if TS_USE_KQUEUE
#include <sys/event.h>
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/e568bb32/iocore/net/SSLClientUtils.cc
----------------------------------------------------------------------
diff --git a/iocore/net/SSLClientUtils.cc b/iocore/net/SSLClientUtils.cc
index 7971b66..c37b11f 100644
--- a/iocore/net/SSLClientUtils.cc
+++ b/iocore/net/SSLClientUtils.cc
@@ -21,7 +21,7 @@
#include "ts/ink_config.h"
#include "records/I_RecHttp.h"
-#include "ts/libts.h"
+#include "ts/ink_platform.h"
#include "P_Net.h"
#include "P_SSLClientUtils.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/e568bb32/iocore/net/SSLConfig.cc
----------------------------------------------------------------------
diff --git a/iocore/net/SSLConfig.cc b/iocore/net/SSLConfig.cc
index 611d757..38e0eea 100644
--- a/iocore/net/SSLConfig.cc
+++ b/iocore/net/SSLConfig.cc
@@ -29,7 +29,7 @@
SSL Configurations
****************************************************************************/
-#include "ts/libts.h"
+#include "ts/ink_platform.h"
#include "ts/I_Layout.h"
#include <string.h>
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/e568bb32/iocore/net/SSLDynlock.cc
----------------------------------------------------------------------
diff --git a/iocore/net/SSLDynlock.cc b/iocore/net/SSLDynlock.cc
index 1ce9aa8..2590649 100644
--- a/iocore/net/SSLDynlock.cc
+++ b/iocore/net/SSLDynlock.cc
@@ -19,7 +19,12 @@
limitations under the License.
*/
-#include "ts/libts.h"
+#include <openssl/crypto.h>
+
+#include "ts/ink_platform.h"
+#include "ts/ink_mutex.h"
+#include "ts/ink_assert.h"
+#include "ts/Diags.h"
struct CRYPTO_dynlock_value {
CRYPTO_dynlock_value(const char *f, int l) : file(f), line(l) { pthread_mutex_init(&mutex, NULL); }
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/e568bb32/iocore/net/SSLNextProtocolSet.cc
----------------------------------------------------------------------
diff --git a/iocore/net/SSLNextProtocolSet.cc b/iocore/net/SSLNextProtocolSet.cc
index 31c2b8f..c12d766 100644
--- a/iocore/net/SSLNextProtocolSet.cc
+++ b/iocore/net/SSLNextProtocolSet.cc
@@ -23,7 +23,7 @@
#include "ts/ink_config.h"
#include "ts/apidefs.h"
-#include "ts/libts.h"
+#include "ts/ink_platform.h"
#include "P_SSLNextProtocolSet.h"
// For currently defined protocol strings, see
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/e568bb32/iocore/net/SSLSessionCache.h
----------------------------------------------------------------------
diff --git a/iocore/net/SSLSessionCache.h b/iocore/net/SSLSessionCache.h
index 135b2dd..313d002 100644
--- a/iocore/net/SSLSessionCache.h
+++ b/iocore/net/SSLSessionCache.h
@@ -28,7 +28,7 @@
#include "P_EventSystem.h"
#include "P_AIO.h"
#include "I_RecProcess.h"
-#include "ts/libts.h"
+#include "ts/ink_platform.h"
#include "P_SSLUtils.h"
#include "ts/RbTree.h"
#include <openssl/ssl.h>
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/e568bb32/iocore/net/SSLUtils.cc
----------------------------------------------------------------------
diff --git a/iocore/net/SSLUtils.cc b/iocore/net/SSLUtils.cc
index 4b42df6..29312a7 100644
--- a/iocore/net/SSLUtils.cc
+++ b/iocore/net/SSLUtils.cc
@@ -21,7 +21,7 @@
#include "ts/ink_config.h"
#include "records/I_RecHttp.h"
-#include "ts/libts.h"
+#include "ts/ink_platform.h"
#include "ts/I_Layout.h"
#include "P_Net.h"
#include "ts/ink_cap.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/e568bb32/iocore/net/UnixNetPages.cc
----------------------------------------------------------------------
diff --git a/iocore/net/UnixNetPages.cc b/iocore/net/UnixNetPages.cc
index 41a286d..40f95b9 100644
--- a/iocore/net/UnixNetPages.cc
+++ b/iocore/net/UnixNetPages.cc
@@ -21,7 +21,7 @@
limitations under the License.
*/
-#include "ts/libts.h"
+#include "ts/ink_platform.h"
#include "P_Net.h"
#include "Show.h"
#include "I_Tasks.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/e568bb32/iocore/net/UnixNetVConnection.cc
----------------------------------------------------------------------
diff --git a/iocore/net/UnixNetVConnection.cc b/iocore/net/UnixNetVConnection.cc
index c3d7540..129cbab 100644
--- a/iocore/net/UnixNetVConnection.cc
+++ b/iocore/net/UnixNetVConnection.cc
@@ -22,7 +22,7 @@
*/
#include "P_Net.h"
-#include "ts/libts.h"
+#include "ts/ink_platform.h"
#include "Log.h"
#define STATE_VIO_OFFSET ((uintptr_t) & ((NetState *)0)->vio)
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/e568bb32/iocore/net/test_P_UDPNet.cc
----------------------------------------------------------------------
diff --git a/iocore/net/test_P_UDPNet.cc b/iocore/net/test_P_UDPNet.cc
index 76ee379..a0dff55 100644
--- a/iocore/net/test_P_UDPNet.cc
+++ b/iocore/net/test_P_UDPNet.cc
@@ -25,7 +25,7 @@
#include <stdlib.h>
#include "P_Net.h"
-#include "ts/libts.h"
+#include "ts/ink_platform.h"
// Diags stuff from test_I_Net.cc:
Diags *diags;
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/e568bb32/iocore/utils/Machine.cc
----------------------------------------------------------------------
diff --git a/iocore/utils/Machine.cc b/iocore/utils/Machine.cc
index 9af5551..403a124 100644
--- a/iocore/utils/Machine.cc
+++ b/iocore/utils/Machine.cc
@@ -21,7 +21,10 @@
limitations under the License.
*/
-#include "ts/libts.h"
+#include "ts/ink_platform.h"
+#include "ts/ink_inet.h"
+#include "ts/ink_assert.h"
+#include "ts/Diags.h"
#include "I_Machine.h"
#if HAVE_IFADDRS_H
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/e568bb32/lib/records/P_RecCore.cc
----------------------------------------------------------------------
diff --git a/lib/records/P_RecCore.cc b/lib/records/P_RecCore.cc
index 6eede2d..cfca570 100644
--- a/lib/records/P_RecCore.cc
+++ b/lib/records/P_RecCore.cc
@@ -21,7 +21,8 @@
limitations under the License.
*/
-#include "ts/libts.h"
+#include "ts/ink_platform.h"
+#include "ts/ink_memory.h"
#include "ts/TextBuffer.h"
#include "ts/Tokenizer.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/e568bb32/lib/records/RecConfigParse.cc
----------------------------------------------------------------------
diff --git a/lib/records/RecConfigParse.cc b/lib/records/RecConfigParse.cc
index a801aba..94f8100 100644
--- a/lib/records/RecConfigParse.cc
+++ b/lib/records/RecConfigParse.cc
@@ -21,7 +21,8 @@
limitations under the License.
*/
-#include "ts/libts.h"
+#include "ts/ink_platform.h"
+#include "ts/ink_memory.h"
#include "ts/TextBuffer.h"
#include "ts/Tokenizer.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/e568bb32/lib/records/RecCore.cc
----------------------------------------------------------------------
diff --git a/lib/records/RecCore.cc b/lib/records/RecCore.cc
index 34cef55..6ad0db8 100644
--- a/lib/records/RecCore.cc
+++ b/lib/records/RecCore.cc
@@ -21,7 +21,9 @@
limitations under the License.
*/
-#include "ts/libts.h"
+#include "ts/ink_platform.h"
+#include "ts/ink_memory.h"
+#include "ts/ink_string.h"
#include "P_RecFile.h"
#include "P_RecCore.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/e568bb32/lib/records/RecFile.cc
----------------------------------------------------------------------
diff --git a/lib/records/RecFile.cc b/lib/records/RecFile.cc
index 8464923..fe7dc5f 100644
--- a/lib/records/RecFile.cc
+++ b/lib/records/RecFile.cc
@@ -21,7 +21,8 @@
limitations under the License.
*/
-#include "ts/libts.h"
+#include "ts/ink_platform.h"
+#include "ts/ink_string.h"
#include "P_RecFile.h"
#include "P_RecDefs.h"
#include "P_RecUtils.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/e568bb32/lib/records/RecLocal.cc
----------------------------------------------------------------------
diff --git a/lib/records/RecLocal.cc b/lib/records/RecLocal.cc
index c9ad6a0..c97f93e 100644
--- a/lib/records/RecLocal.cc
+++ b/lib/records/RecLocal.cc
@@ -21,7 +21,7 @@
limitations under the License.
*/
-#include "ts/libts.h"
+#include "ts/ink_platform.h"
#include "Rollback.h"
#include "ts/ParseRules.h"
#include "P_RecCore.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/e568bb32/lib/records/RecMessage.cc
----------------------------------------------------------------------
diff --git a/lib/records/RecMessage.cc b/lib/records/RecMessage.cc
index 016d15a..48bb284 100644
--- a/lib/records/RecMessage.cc
+++ b/lib/records/RecMessage.cc
@@ -21,7 +21,9 @@
limitations under the License.
*/
-#include "ts/libts.h"
+#include "ts/ink_platform.h"
+#include "ts/ink_memory.h"
+#include "ts/ink_align.h"
#include "P_RecCore.h"
#include "P_RecFile.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/e568bb32/lib/records/RecProcess.cc
----------------------------------------------------------------------
diff --git a/lib/records/RecProcess.cc b/lib/records/RecProcess.cc
index 255f9e5..8f31ceb 100644
--- a/lib/records/RecProcess.cc
+++ b/lib/records/RecProcess.cc
@@ -21,7 +21,7 @@
limitations under the License.
*/
-#include "ts/libts.h"
+#include "ts/ink_platform.h"
#include "I_Tasks.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/e568bb32/lib/records/RecUtils.cc
----------------------------------------------------------------------
diff --git a/lib/records/RecUtils.cc b/lib/records/RecUtils.cc
index c47b5c8..54bb351 100644
--- a/lib/records/RecUtils.cc
+++ b/lib/records/RecUtils.cc
@@ -21,7 +21,9 @@
limitations under the License.
*/
-#include "ts/libts.h"
+#include "ts/ink_platform.h"
+#include "ts/ink_memory.h"
+#include "ts/ParseRules.h"
#include "P_RecUtils.h"
#include "P_RecCore.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/e568bb32/lib/ts/Arena.cc
----------------------------------------------------------------------
diff --git a/lib/ts/Arena.cc b/lib/ts/Arena.cc
index bc3aac7..7981b40 100644
--- a/lib/ts/Arena.cc
+++ b/lib/ts/Arena.cc
@@ -21,8 +21,10 @@
limitations under the License.
*/
-#include "ts/ink_mutex.h"
-#include "ts/libts.h"
+#include "ts/ink_platform.h"
+#include "ts/ink_memory.h"
+#include "ts/Allocator.h"
+#include "ts/Arena.h"
#include <assert.h>
#include <string.h>
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/e568bb32/lib/ts/CryptoHash.h
----------------------------------------------------------------------
diff --git a/lib/ts/CryptoHash.h b/lib/ts/CryptoHash.h
index 28b6296..aec07bb 100644
--- a/lib/ts/CryptoHash.h
+++ b/lib/ts/CryptoHash.h
@@ -1,6 +1,3 @@
-#if !defined CRYPTO_HASH_HEADER
-#define CRYPTO_HASH_HEADER
-
/** @file
Protocol class for crypto hashes.
@@ -23,7 +20,13 @@
limitations under the License.
*/
+#if !defined CRYPTO_HASH_HEADER
+#define CRYPTO_HASH_HEADER
+
/// Apache Traffic Server commons.
+
+#include "ts/ink_code.h"
+
namespace ats
{
/// Crypto hash output.
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/e568bb32/lib/ts/HostLookup.cc
----------------------------------------------------------------------
diff --git a/lib/ts/HostLookup.cc b/lib/ts/HostLookup.cc
index 2b6bdaf..24f1e04 100644
--- a/lib/ts/HostLookup.cc
+++ b/lib/ts/HostLookup.cc
@@ -27,7 +27,13 @@
*
*
****************************************************************************/
-#include "ts/libts.h"
+#include "ts/ink_platform.h"
+#include "ts/ink_memory.h"
+#include "ts/DynArray.h"
+#include "ts/ink_inet.h"
+#include "ts/ink_assert.h"
+#include "ts/ink_hash_table.h"
+#include "ts/Tokenizer.h"
#include "ts/HostLookup.h"
#include "ts/MatcherUtils.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/e568bb32/lib/ts/Layout.cc
----------------------------------------------------------------------
diff --git a/lib/ts/Layout.cc b/lib/ts/Layout.cc
index 730b399..309c102 100644
--- a/lib/ts/Layout.cc
+++ b/lib/ts/Layout.cc
@@ -21,7 +21,11 @@
limitations under the License.
*/
-#include "ts/libts.h"
+#include "ts/ink_platform.h"
+#include "ts/ink_assert.h"
+#include "ts/ink_file.h"
+#include "ts/ink_memory.h"
+#include "ts/ink_string.h"
#include "ts/I_Layout.h"
static Layout *layout = NULL;
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/e568bb32/lib/ts/MatcherUtils.cc
----------------------------------------------------------------------
diff --git a/lib/ts/MatcherUtils.cc b/lib/ts/MatcherUtils.cc
index 8e8935b..ae86c4b 100644
--- a/lib/ts/MatcherUtils.cc
+++ b/lib/ts/MatcherUtils.cc
@@ -29,7 +29,13 @@
*
****************************************************************************/
-#include "ts/libts.h" /* MAGIC_EDITING_TAG */
+#include "ts/ink_platform.h"
+#include "ts/Diags.h"
+#include "ts/ink_memory.h"
+#include "ts/ink_inet.h"
+#include "ts/ink_assert.h"
+#include "ts/MatcherUtils.h"
+#include "ts/Tokenizer.h"
config_parse_error::config_parse_error(const char *fmt, ...)
{
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/e568bb32/lib/ts/MimeTable.cc
----------------------------------------------------------------------
diff --git a/lib/ts/MimeTable.cc b/lib/ts/MimeTable.cc
index 6e4e8cf..70266af 100644
--- a/lib/ts/MimeTable.cc
+++ b/lib/ts/MimeTable.cc
@@ -21,7 +21,8 @@
limitations under the License.
*/
-#include "ts/libts.h" /* MAGIC_EDITING_TAG */
+#include "ts/ink_platform.h"
+#include "ts/MimeTable.h"
MimeTableEntry MimeTable::m_table[] = {{"ai", "application/postscript", "8bit", "text"},
{"aif", "audio/x-aiff", "binary", "sound"},
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/e568bb32/lib/ts/ParseRules.cc
----------------------------------------------------------------------
diff --git a/lib/ts/ParseRules.cc b/lib/ts/ParseRules.cc
index 12a221a..ffc4a4e 100644
--- a/lib/ts/ParseRules.cc
+++ b/lib/ts/ParseRules.cc
@@ -28,7 +28,8 @@
****************************************************************************/
-#include "ts/libts.h" /* MAGIC_EDITING_TAG */
+#include "ts/ink_platform.h"
+#include "ts/ParseRules.h"
const unsigned int parseRulesCType[256] = {
#include "ParseRulesCType"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/e568bb32/lib/ts/Regex.cc
----------------------------------------------------------------------
diff --git a/lib/ts/Regex.cc b/lib/ts/Regex.cc
index dcaae99..c3f6267 100644
--- a/lib/ts/Regex.cc
+++ b/lib/ts/Regex.cc
@@ -21,7 +21,9 @@
limitations under the License.
*/
-#include "ts/libts.h"
+#include "ts/ink_platform.h"
+#include "ts/ink_thread.h"
+#include "ts/ink_memory.h"
#include "ts/Regex.h"
#ifdef PCRE_CONFIG_JIT
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/e568bb32/lib/ts/Regression.h
----------------------------------------------------------------------
diff --git a/lib/ts/Regression.h b/lib/ts/Regression.h
index 0a29804..f86c7ee 100644
--- a/lib/ts/Regression.h
+++ b/lib/ts/Regression.h
@@ -24,7 +24,7 @@
#ifndef _Regression_h
#define _Regression_h
-#include "ts/libts.h"
+#include "ts/ink_platform.h"
#include "ts/Regex.h"
// Each module should provide one or more regression tests
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/e568bb32/lib/ts/TextBuffer.cc
----------------------------------------------------------------------
diff --git a/lib/ts/TextBuffer.cc b/lib/ts/TextBuffer.cc
index 08fe4fe..149baf3 100644
--- a/lib/ts/TextBuffer.cc
+++ b/lib/ts/TextBuffer.cc
@@ -21,7 +21,8 @@
limitations under the License.
*/
-#include "ts/libts.h"
+#include "ts/ink_platform.h"
+#include "ts/ink_memory.h"
#include "ts/TextBuffer.h"
/****************************************************************************
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/e568bb32/lib/ts/Version.cc
----------------------------------------------------------------------
diff --git a/lib/ts/Version.cc b/lib/ts/Version.cc
index 69121cb..e7b007f 100644
--- a/lib/ts/Version.cc
+++ b/lib/ts/Version.cc
@@ -21,7 +21,9 @@
limitations under the License.
*/
-#include "ts/libts.h"
+#include "ts/ink_platform.h"
+#include "ts/I_Version.h"
+#include "ts/ink_string.h"
AppVersionInfo::AppVersionInfo()
{
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/e568bb32/lib/ts/ink_args.cc
----------------------------------------------------------------------
diff --git a/lib/ts/ink_args.cc b/lib/ts/ink_args.cc
index 983d002..f0c05b8 100644
--- a/lib/ts/ink_args.cc
+++ b/lib/ts/ink_args.cc
@@ -26,7 +26,13 @@ Process arguments
****************************************************************************/
-#include "ts/libts.h"
+#include "ts/ink_platform.h"
+#include "ts/ink_args.h"
+#include "ts/Diags.h"
+#include "ts/I_Version.h"
+#include "ts/ink_file.h"
+#include "ts/ink_memory.h"
+#include "ts/ink_string.h"
//
// Global variables
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/e568bb32/lib/ts/ink_base64.cc
----------------------------------------------------------------------
diff --git a/lib/ts/ink_base64.cc b/lib/ts/ink_base64.cc
index 7fa771f..a994e77 100644
--- a/lib/ts/ink_base64.cc
+++ b/lib/ts/ink_base64.cc
@@ -31,7 +31,8 @@
* These routines return char*'s to malloc-ed strings. The caller is
* responsible for freeing the strings.
*/
-#include "ts/libts.h"
+#include "ts/ink_platform.h"
+#include "ts/ink_base64.h"
#include "ts/ink_assert.h"
// TODO: The code here seems a bit klunky, and could probably be improved a bit.
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/e568bb32/lib/ts/ink_defs.cc
----------------------------------------------------------------------
diff --git a/lib/ts/ink_defs.cc b/lib/ts/ink_defs.cc
index d913174..66884cf 100644
--- a/lib/ts/ink_defs.cc
+++ b/lib/ts/ink_defs.cc
@@ -28,8 +28,8 @@
****************************************************************************/
-#include "ts/libts.h"
#include "ts/ink_platform.h"
+
#if defined(linux) || defined(freebsd) || defined(darwin)
#include <sys/types.h>
#include <sys/param.h>
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/e568bb32/lib/ts/ink_error.cc
----------------------------------------------------------------------
diff --git a/lib/ts/ink_error.cc b/lib/ts/ink_error.cc
index 481992c..ebb54dd 100644
--- a/lib/ts/ink_error.cc
+++ b/lib/ts/ink_error.cc
@@ -22,7 +22,7 @@
*/
-#include "ts/libts.h"
+#include "ts/ink_platform.h"
#include "ts/ink_error.h"
#include "ts/ink_stack_trace.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/e568bb32/lib/ts/ink_inet.cc
----------------------------------------------------------------------
diff --git a/lib/ts/ink_inet.cc b/lib/ts/ink_inet.cc
index a880a41..850afd1 100644
--- a/lib/ts/ink_inet.cc
+++ b/lib/ts/ink_inet.cc
@@ -21,7 +21,12 @@
limitations under the License.
*/
-#include "ts/libts.h"
+#include "ts/ink_platform.h"
+#include "ts/ink_defs.h"
+#include "ts/ink_inet.h"
+#include "ts/ParseRules.h"
+#include "ts/ink_code.h"
+#include "ts/ink_assert.h"
#include "ts/TestBox.h"
#if defined(darwin)
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/e568bb32/lib/ts/ink_memory.cc
----------------------------------------------------------------------
diff --git a/lib/ts/ink_memory.cc b/lib/ts/ink_memory.cc
index ffbc9ae..c865379 100644
--- a/lib/ts/ink_memory.cc
+++ b/lib/ts/ink_memory.cc
@@ -20,7 +20,11 @@
See the License for the specific language governing permissions and
limitations under the License.
*/
-#include "ts/libts.h"
+#include "ts/ink_platform.h"
+#include "ts/ink_memory.h"
+#include "ts/ink_defs.h"
+#include "ts/ink_stack_trace.h"
+#include "ts/Diags.h"
#include <assert.h>
#if defined(linux)
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/e568bb32/lib/ts/ink_sock.cc
----------------------------------------------------------------------
diff --git a/lib/ts/ink_sock.cc b/lib/ts/ink_sock.cc
index 94c3f8a..3c447a2 100644
--- a/lib/ts/ink_sock.cc
+++ b/lib/ts/ink_sock.cc
@@ -27,7 +27,10 @@
***************************************************************************/
-#include "ts/libts.h"
+#include "ts/ink_platform.h"
+#include "ts/ink_assert.h"
+#include "ts/ink_string.h"
+#include "ts/ink_inet.h"
//
// Compilation options
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/e568bb32/lib/ts/ink_string++.cc
----------------------------------------------------------------------
diff --git a/lib/ts/ink_string++.cc b/lib/ts/ink_string++.cc
index 77d51f4..3b47eb6 100644
--- a/lib/ts/ink_string++.cc
+++ b/lib/ts/ink_string++.cc
@@ -30,7 +30,11 @@
****************************************************************************/
-#include "ts/libts.h"
+#include "ts/ink_platform.h"
+#include "ts/ink_string++.h"
+#include "ts/ink_assert.h"
+#include "ts/ink_memory.h"
+#include "ts/ink_align.h"
/***********************************************************************
* *
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/e568bb32/lib/ts/ink_string.cc
----------------------------------------------------------------------
diff --git a/lib/ts/ink_string.cc b/lib/ts/ink_string.cc
index 5d56c7b..529bab9 100644
--- a/lib/ts/ink_string.cc
+++ b/lib/ts/ink_string.cc
@@ -21,7 +21,8 @@
limitations under the License.
*/
-#include "ts/libts.h" /* MAGIC_EDITING_TAG */
+#include "ts/ink_platform.h"
+#include "ts/ink_assert.h"
#include <assert.h>
#include <stdarg.h>
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/e568bb32/lib/ts/ink_thread.cc
----------------------------------------------------------------------
diff --git a/lib/ts/ink_thread.cc b/lib/ts/ink_thread.cc
index d84812e..953f2d7 100644
--- a/lib/ts/ink_thread.cc
+++ b/lib/ts/ink_thread.cc
@@ -28,7 +28,8 @@
Generic threads interface.
**************************************************************************/
-#include "ts/libts.h"
+#include "ts/ink_platform.h"
+#include "ts/ink_thread.h"
// // ignore the compiler warning... so that this can be used
// // in the face of changes to the Solaris header files (see "man thread")
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/e568bb32/lib/ts/signals.cc
----------------------------------------------------------------------
diff --git a/lib/ts/signals.cc b/lib/ts/signals.cc
index 6397b96..6cf664d 100644
--- a/lib/ts/signals.cc
+++ b/lib/ts/signals.cc
@@ -26,9 +26,12 @@
**************************************************************************/
-#include "ts/libts.h"
+#include "ts/ink_platform.h"
#include "ts/signals.h"
#include "ts/ink_stack_trace.h"
+#include "ts/ink_assert.h"
+#include "ts/ink_thread.h"
+#include "ts/Diags.h"
bool
signal_check_handler(int signal, signal_handler_t handler)
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/e568bb32/lib/ts/test_X509HostnameValidator.cc
----------------------------------------------------------------------
diff --git a/lib/ts/test_X509HostnameValidator.cc b/lib/ts/test_X509HostnameValidator.cc
index 8344483..5305bb0 100644
--- a/lib/ts/test_X509HostnameValidator.cc
+++ b/lib/ts/test_X509HostnameValidator.cc
@@ -26,6 +26,10 @@
#include <openssl/ssl.h>
#include <openssl/bio.h>
+#include "ts/ink_apidefs.h"
+#include "ts/Diags.h"
+#include "ts/ink_resource.h"
+#include "ts/ink_queue.h"
#include "ts/X509HostnameValidator.h"
#include "ts/TestBox.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/e568bb32/lib/ts/test_geometry.cc
----------------------------------------------------------------------
diff --git a/lib/ts/test_geometry.cc b/lib/ts/test_geometry.cc
index 6d9eaa0..0ebf842 100644
--- a/lib/ts/test_geometry.cc
+++ b/lib/ts/test_geometry.cc
@@ -21,8 +21,9 @@
limitations under the License.
*/
-#include "ts/libts.h"
#include "ts/ink_platform.h"
+#include "ts/ink_defs.h"
+#include "ts/ink_file.h"
// This isn't really a unit test. It's just a dumb little program to probe the disk
// geometry of an arbitrary device file. That's useful when figuring out how ATS will