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 <[email protected]> Authored: Tue Jul 14 13:52:05 2015 -0600 Committer: Leif Hedstrom <[email protected]> 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
