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 <[email protected]> Authored: Thu Jul 16 12:09:51 2015 -0600 Committer: Leif Hedstrom <[email protected]> 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;
