TS-3759 Eliminate -Ilib/ts
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/23ce6934 Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/23ce6934 Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/23ce6934 Branch: refs/heads/master Commit: 23ce6934e4a6ab3d261581e10d7d6d344f424b0d Parents: a7a9570 Author: Leif Hedstrom <[email protected]> Authored: Fri Jul 10 15:00:25 2015 -0600 Committer: Leif Hedstrom <[email protected]> Committed: Thu Jul 16 14:25:32 2015 -0600 ---------------------------------------------------------------------- build/plugins.mk | 1 - cmd/traffic_cop/Makefile.am | 2 -- cmd/traffic_cop/traffic_cop.cc | 8 ++++---- cmd/traffic_crashlog/Makefile.am | 2 -- cmd/traffic_crashlog/traffic_crashlog.cc | 8 ++++---- cmd/traffic_crashlog/traffic_crashlog.h | 2 +- cmd/traffic_ctl/Makefile.am | 2 -- cmd/traffic_ctl/traffic_ctl.h | 6 +++--- cmd/traffic_layout/Makefile.am | 2 -- cmd/traffic_layout/traffic_layout.cc | 10 +++++----- cmd/traffic_line/Makefile.am | 2 -- cmd/traffic_line/traffic_line.cc | 10 +++++----- cmd/traffic_manager/AddConfigFilesHere.cc | 4 ++-- cmd/traffic_manager/Makefile.am | 5 +---- cmd/traffic_manager/MgmtHandlers.cc | 4 ++-- cmd/traffic_manager/StatProcessor.cc | 2 +- cmd/traffic_manager/StatProcessor.h | 4 ++-- cmd/traffic_manager/StatType.cc | 6 +++--- cmd/traffic_manager/StatXML.cc | 2 +- cmd/traffic_manager/StatXML.h | 2 +- cmd/traffic_manager/WebOverview.cc | 4 ++-- cmd/traffic_manager/WebOverview.h | 8 ++++---- cmd/traffic_manager/traffic_manager.cc | 8 ++++---- cmd/traffic_top/Makefile.am | 2 -- cmd/traffic_top/traffic_top.cc | 2 +- cmd/traffic_via/Makefile.am | 2 -- cmd/traffic_via/traffic_via.cc | 12 ++++++------ cmd/traffic_wccp/Makefile.am | 1 - cmd/traffic_wccp/wccp_client.cc | 4 ++-- example/session-1/session-1.c | 2 +- iocore/aio/I_AIO.h | 2 +- iocore/aio/Makefile.am | 4 +--- iocore/aio/test_AIO.cc | 2 +- iocore/cache/Cache.cc | 4 ++-- iocore/cache/CacheDir.cc | 4 ++-- iocore/cache/CacheHosting.cc | 2 +- iocore/cache/CacheHttp.cc | 2 +- iocore/cache/I_Cache.h | 2 +- iocore/cache/I_Store.h | 2 +- iocore/cache/Makefile.am | 2 -- iocore/cache/P_Cache.h | 4 ++-- iocore/cache/P_CacheInternal.h | 2 +- iocore/cache/Store.cc | 4 ++-- iocore/cluster/ClusterMachine.cc | 4 ++-- iocore/cluster/Makefile.am | 2 -- iocore/cluster/P_Cluster.h | 2 +- iocore/dns/Makefile.am | 2 -- iocore/dns/P_DNS.h | 2 +- iocore/dns/P_DNSProcessor.h | 2 +- iocore/dns/SRV.h | 2 +- iocore/dns/SplitDNS.cc | 6 +++--- iocore/eventsystem/IOBuffer.cc | 2 +- iocore/eventsystem/I_Action.h | 2 +- iocore/eventsystem/I_Continuation.h | 2 +- iocore/eventsystem/I_EThread.h | 2 +- iocore/eventsystem/I_Event.h | 2 +- iocore/eventsystem/I_EventProcessor.h | 2 +- iocore/eventsystem/I_EventSystem.h | 2 +- iocore/eventsystem/I_IOBuffer.h | 4 ++-- iocore/eventsystem/I_Lock.h | 2 +- iocore/eventsystem/I_PriorityEventQueue.h | 2 +- iocore/eventsystem/I_Processor.h | 2 +- iocore/eventsystem/I_ProtectedQueue.h | 2 +- iocore/eventsystem/I_ProxyAllocator.h | 2 +- iocore/eventsystem/I_SocketManager.h | 2 +- iocore/eventsystem/I_Thread.h | 2 +- iocore/eventsystem/I_VConnection.h | 2 +- iocore/eventsystem/I_VIO.h | 4 ++-- iocore/eventsystem/Lock.cc | 2 +- iocore/eventsystem/Makefile.am | 4 +--- iocore/eventsystem/P_EventSystem.h | 2 +- iocore/eventsystem/P_Freer.h | 2 +- iocore/eventsystem/P_IOBuffer.h | 4 ++-- iocore/eventsystem/P_UnixSocketManager.h | 2 +- iocore/eventsystem/SocketManager.cc | 2 +- iocore/eventsystem/UnixEventProcessor.cc | 2 +- iocore/eventsystem/test_Buffer.cc | 2 +- iocore/eventsystem/test_Event.cc | 2 +- iocore/hostdb/HostDB.cc | 4 ++-- iocore/hostdb/Makefile.am | 2 -- iocore/hostdb/MultiCache.cc | 6 +++--- iocore/hostdb/P_HostDB.h | 2 +- iocore/net/Connection.cc | 2 +- iocore/net/I_Net.h | 2 +- iocore/net/I_NetVConnection.h | 2 +- iocore/net/I_UDPNet.h | 4 ++-- iocore/net/Makefile.am | 2 -- iocore/net/P_Connection.h | 2 +- iocore/net/P_Net.h | 2 +- iocore/net/P_NetAccept.h | 2 +- iocore/net/P_NetVCTest.h | 2 +- iocore/net/P_SSLClientUtils.h | 4 ++-- iocore/net/P_SSLNetAccept.h | 2 +- iocore/net/P_SSLNetProcessor.h | 2 +- iocore/net/P_SSLNetVConnection.h | 4 ++-- iocore/net/P_SSLNextProtocolSet.h | 2 +- iocore/net/P_SSLUtils.h | 4 ++-- iocore/net/P_UnixNet.h | 2 +- iocore/net/P_UnixNetState.h | 2 +- iocore/net/P_UnixNetVConnection.h | 2 +- iocore/net/P_UnixPollDescriptor.h | 2 +- iocore/net/SSLCertLookup.cc | 8 ++++---- iocore/net/SSLClientUtils.cc | 4 ++-- iocore/net/SSLConfig.cc | 4 ++-- iocore/net/SSLDynlock.cc | 2 +- iocore/net/SSLInternal.cc | 2 +- iocore/net/SSLNetAccept.cc | 2 +- iocore/net/SSLNetProcessor.cc | 4 ++-- iocore/net/SSLNetVConnection.cc | 2 +- iocore/net/SSLNextProtocolSet.cc | 6 +++--- iocore/net/SSLSessionCache.h | 10 +++++----- iocore/net/SSLUtils.cc | 8 ++++---- iocore/net/Socks.cc | 2 +- iocore/net/UnixNetPages.cc | 2 +- iocore/net/UnixNetVConnection.cc | 2 +- iocore/net/test_I_UDPNet.cc | 2 +- iocore/net/test_P_UDPNet.cc | 2 +- iocore/utils/Machine.cc | 2 +- iocore/utils/Makefile.am | 2 -- lib/atscppapi/src/Makefile.am | 8 ++++---- lib/atscppapi/src/Transaction.cc | 2 +- lib/records/I_RecCore.h | 2 +- lib/records/I_RecDefs.h | 4 ++-- lib/records/I_RecMutex.h | 4 ++-- lib/records/Makefile.am | 4 +--- lib/records/P_RecCore.cc | 10 +++++----- lib/records/P_RecCore.h | 10 +++++----- lib/records/P_RecUtils.h | 4 ++-- lib/records/RecConfigParse.cc | 12 ++++++------ lib/records/RecCore.cc | 4 ++-- lib/records/RecFile.cc | 2 +- lib/records/RecLocal.cc | 4 ++-- lib/records/RecMessage.cc | 4 ++-- lib/records/RecMutex.cc | 2 +- lib/records/RecProcess.cc | 2 +- lib/records/RecUtils.cc | 2 +- lib/records/test_RecProcess.i | 2 +- lib/ts/Arena.cc | 4 ++-- lib/ts/Bitops.cc | 2 +- lib/ts/CompileParseRules.cc | 4 ++-- lib/ts/ConsistentHash.cc | 2 +- lib/ts/Diags.cc | 16 ++++++++-------- lib/ts/EventNotify.cc | 6 +++--- lib/ts/Hash.cc | 2 +- lib/ts/HashFNV.cc | 2 +- lib/ts/HashMD5.cc | 2 +- lib/ts/HashSip.cc | 2 +- lib/ts/HostLookup.cc | 6 +++--- lib/ts/IpMap.cc | 2 +- lib/ts/Layout.cc | 4 ++-- lib/ts/MMH.cc | 6 +++--- lib/ts/MatcherUtils.cc | 2 +- lib/ts/MatcherUtils.h | 2 +- lib/ts/MimeTable.cc | 2 +- lib/ts/ParseRules.cc | 2 +- lib/ts/RawHashTable.cc | 2 +- lib/ts/RbTree.cc | 2 +- lib/ts/Regex.cc | 4 ++-- lib/ts/Regression.cc | 4 ++-- lib/ts/Regression.h | 4 ++-- lib/ts/TestHttpHeader.cc | 2 +- lib/ts/TextBuffer.cc | 4 ++-- lib/ts/Tokenizer.cc | 10 +++++----- lib/ts/Vec.cc | 2 +- lib/ts/Vec.h | 2 +- lib/ts/Version.cc | 2 +- lib/ts/X509HostnameValidator.cc | 2 +- lib/ts/hugepages.cc | 4 ++-- lib/ts/ink_args.cc | 2 +- lib/ts/ink_assert.cc | 8 ++++---- lib/ts/ink_auth_api.cc | 6 +++--- lib/ts/ink_base64.cc | 4 ++-- lib/ts/ink_cap.cc | 8 ++++---- lib/ts/ink_code.cc | 8 ++++---- lib/ts/ink_defs.cc | 4 ++-- lib/ts/ink_error.cc | 6 +++--- lib/ts/ink_file.cc | 2 +- lib/ts/ink_hash_table.cc | 6 +++--- lib/ts/ink_hrtime.cc | 6 +++--- lib/ts/ink_inet.cc | 2 +- lib/ts/ink_memory.cc | 2 +- lib/ts/ink_mutex.cc | 6 +++--- lib/ts/ink_queue.cc | 16 ++++++++-------- lib/ts/ink_queue_utils.cc | 6 +++--- lib/ts/ink_rand.cc | 2 +- lib/ts/ink_res_init.cc | 12 ++++++------ lib/ts/ink_res_mkquery.cc | 8 ++++---- lib/ts/ink_resource.cc | 6 +++--- lib/ts/ink_rwlock.cc | 4 ++-- lib/ts/ink_sock.cc | 2 +- lib/ts/ink_sprintf.cc | 2 +- lib/ts/ink_stack_trace.cc | 4 ++-- lib/ts/ink_string++.cc | 2 +- lib/ts/ink_string.cc | 2 +- lib/ts/ink_sys_control.cc | 6 +++--- lib/ts/ink_syslog.cc | 2 +- lib/ts/ink_thread.cc | 2 +- lib/ts/ink_time.cc | 10 +++++----- lib/ts/libts.h | 2 +- lib/ts/llqueue.cc | 6 +++--- lib/ts/load_http_hdr.cc | 2 +- lib/ts/lockfile.cc | 4 ++-- lib/ts/signals.cc | 6 +++--- lib/ts/test_Map.cc | 2 +- lib/ts/test_Vec.cc | 4 ++-- lib/ts/test_arena.cc | 2 +- lib/ts/test_freelist.cc | 4 ++-- lib/tsconfig/Makefile.am | 4 +--- lib/wccp/Makefile.am | 1 - lib/wccp/Wccp.h | 4 ++-- lib/wccp/WccpEndPoint.cc | 4 ++-- lib/wccp/WccpMsg.cc | 4 ++-- lib/wccp/WccpStatic.cc | 4 ++-- mgmt/Alarms.cc | 4 ++-- mgmt/Alarms.h | 4 ++-- mgmt/BaseManager.cc | 2 +- mgmt/BaseManager.h | 6 +++--- mgmt/FileManager.cc | 4 ++-- mgmt/FileManager.h | 4 ++-- mgmt/LocalManager.cc | 8 ++++---- mgmt/Makefile.am | 2 -- mgmt/MgmtDefs.h | 4 ++-- mgmt/MultiFile.cc | 18 +++++++++--------- mgmt/ProcessManager.cc | 6 +++--- mgmt/ProcessManager.h | 4 ++-- mgmt/ProxyConfig.cc | 2 +- mgmt/ProxyConfig.h | 2 +- mgmt/RecordsConfig.cc | 2 +- mgmt/RecordsConfigUtils.cc | 4 ++-- mgmt/Rollback.cc | 6 +++--- mgmt/Rollback.h | 10 +++++----- mgmt/WebMgmtUtils.cc | 4 ++-- mgmt/WebMgmtUtils.h | 4 ++-- mgmt/api/APITestCliRemote.cc | 6 +++--- mgmt/api/CfgContextDefs.h | 2 +- mgmt/api/CfgContextImpl.cc | 4 ++-- mgmt/api/CfgContextImpl.h | 2 +- mgmt/api/CfgContextManager.cc | 4 ++-- mgmt/api/CfgContextUtils.cc | 6 +++--- mgmt/api/CoreAPI.cc | 10 +++++----- mgmt/api/CoreAPI.h | 4 ++-- mgmt/api/CoreAPIRemote.cc | 10 +++++----- mgmt/api/CoreAPIShared.cc | 2 +- mgmt/api/EventCallback.cc | 4 ++-- mgmt/api/EventCallback.h | 2 +- mgmt/api/EventControlMain.cc | 2 +- mgmt/api/GenericParser.cc | 2 +- mgmt/api/GenericParser.h | 6 +++--- mgmt/api/INKMgmtAPI.cc | 6 +++--- mgmt/api/Makefile.am | 2 -- mgmt/api/NetworkMessage.cc | 8 ++++---- mgmt/api/NetworkUtilsLocal.cc | 6 +++--- mgmt/api/NetworkUtilsLocal.h | 2 +- mgmt/api/NetworkUtilsRemote.cc | 12 ++++++------ mgmt/api/TSControlMain.cc | 2 +- mgmt/cluster/ClusterCom.cc | 6 +++--- mgmt/cluster/ClusterCom.h | 4 ++-- mgmt/cluster/Makefile.am | 2 -- mgmt/cluster/VMap.cc | 4 ++-- mgmt/cluster/VMap.h | 2 +- mgmt/utils/ExpandingArray.cc | 4 ++-- mgmt/utils/Makefile.am | 2 -- mgmt/utils/MgmtHashTable.h | 6 +++--- mgmt/utils/MgmtMarshall.cc | 2 +- mgmt/utils/MgmtSocket.cc | 2 +- mgmt/utils/MgmtSocket.h | 2 +- mgmt/utils/MgmtUtils.cc | 4 ++-- mgmt/utils/MgmtUtils.h | 4 ++-- mgmt/utils/test_marshall.cc | 6 +++--- plugins/experimental/ats_pagespeed/gzip/gzip.cc | 2 +- plugins/experimental/ats_pagespeed/gzip/misc.cc | 2 +- .../experimental/channel_stats/channel_stats.cc | 4 ++-- plugins/experimental/channel_stats/debug_macros.h | 2 +- proxy/AbstractBuffer.cc | 4 ++-- proxy/AbstractBuffer.h | 2 +- proxy/CacheControl.cc | 4 ++-- proxy/ControlBase.cc | 12 ++++++------ proxy/ControlBase.h | 2 +- proxy/ControlMatcher.cc | 4 ++-- proxy/ControlMatcher.h | 8 ++++---- proxy/CoreUtils.cc | 4 ++-- proxy/CoreUtils.h | 2 +- proxy/Crash.cc | 6 +++--- proxy/EventName.cc | 2 +- proxy/FetchSM.cc | 2 +- proxy/ICP.cc | 2 +- proxy/ICP.h | 2 +- proxy/ICPConfig.cc | 4 ++-- proxy/IPAllow.cc | 2 +- proxy/InkAPI.cc | 4 ++-- proxy/InkAPIInternal.h | 2 +- proxy/InkAPITest.cc | 4 ++-- proxy/InkAPITestTool.cc | 2 +- proxy/InkIOCoreAPI.cc | 2 +- proxy/InkPool_r.h | 2 +- proxy/Main.cc | 10 +++++----- proxy/Main.h | 6 +++--- proxy/Makefile.am | 2 -- proxy/ParentSelection.cc | 2 +- proxy/ParentSelection.h | 4 ++-- proxy/Plugin.cc | 10 +++++----- proxy/Plugin.h | 2 +- proxy/PluginVC.cc | 2 +- proxy/PluginVC.h | 2 +- proxy/ProxyClientSession.h | 2 +- proxy/ReverseProxy.cc | 6 +++--- proxy/ReverseProxy.h | 4 ++-- proxy/SocksProxy.cc | 2 +- proxy/StatPages.cc | 4 ++-- proxy/StatSystem.cc | 2 +- proxy/StatSystem.h | 10 +++++----- proxy/TestClock.cc | 2 +- proxy/TestClusterHash.cc | 2 +- proxy/TestDNS.cc | 2 +- proxy/TestPreProc.cc | 4 ++-- proxy/TestRegex.cc | 2 +- proxy/Transform.cc | 2 +- proxy/congest/Congestion.cc | 2 +- proxy/congest/Congestion.h | 2 +- proxy/congest/CongestionDB.cc | 2 +- proxy/congest/CongestionTest.cc | 2 +- proxy/congest/Makefile.am | 2 -- proxy/hdrs/HTTP.cc | 6 +++--- proxy/hdrs/HTTP.h | 6 +++--- proxy/hdrs/HdrHeap.cc | 2 +- proxy/hdrs/HdrHeap.h | 8 ++++---- proxy/hdrs/HdrTSOnly.cc | 2 +- proxy/hdrs/HdrTest.cc | 6 +++--- proxy/hdrs/HdrTest.h | 2 +- proxy/hdrs/HdrToken.cc | 6 +++--- proxy/hdrs/HdrToken.h | 14 +++++++------- proxy/hdrs/HdrUtils.cc | 2 +- proxy/hdrs/HdrUtils.h | 2 +- proxy/hdrs/HttpCompat.cc | 2 +- proxy/hdrs/HttpCompat.h | 6 +++--- proxy/hdrs/MIME.cc | 4 ++-- proxy/hdrs/MIME.h | 6 +++--- proxy/hdrs/Makefile.am | 4 +--- proxy/hdrs/URL.cc | 4 ++-- proxy/hdrs/URL.h | 8 ++++---- proxy/hdrs/load_http_hdr.cc | 4 ++-- proxy/hdrs/test_header.cc | 4 ++-- proxy/hdrs/test_urlhash.cc | 4 ++-- proxy/http/HttpBodyFactory.cc | 4 ++-- proxy/http/HttpBodyFactory.h | 4 ++-- proxy/http/HttpClientSession.cc | 4 ++-- proxy/http/HttpClientSession.h | 2 +- proxy/http/HttpConfig.cc | 2 +- proxy/http/HttpConfig.h | 4 ++-- proxy/http/HttpConnectionCount.h | 4 ++-- proxy/http/HttpPages.h | 4 ++-- proxy/http/HttpProxyServerMain.cc | 4 ++-- proxy/http/HttpSM.h | 2 +- proxy/http/HttpServerSession.cc | 4 ++-- proxy/http/HttpSessionAccept.h | 2 +- proxy/http/HttpTransact.cc | 6 +++--- proxy/http/HttpTransact.h | 4 ++-- proxy/http/HttpTransactCache.cc | 4 ++-- proxy/http/HttpTransactCache.h | 2 +- proxy/http/HttpTransactHeaders.cc | 2 +- proxy/http/HttpTunnel.cc | 4 ++-- proxy/http/HttpTunnel.h | 2 +- proxy/http/HttpUpdateTester.cc | 4 ++-- proxy/http/Makefile.am | 2 -- proxy/http/RegressionHttpTransact.cc | 2 +- proxy/http/TestHttpTransact.cc | 2 +- proxy/http/remap/Makefile.am | 2 -- proxy/http/remap/RemapConfig.cc | 8 ++++---- proxy/http/remap/RemapPluginInfo.h | 2 +- proxy/http/remap/RemapPlugins.h | 2 +- proxy/http/remap/UrlMapping.cc | 4 ++-- proxy/http/remap/UrlMapping.h | 4 ++-- proxy/http/remap/UrlMappingPathIndex.h | 4 ++-- proxy/http/remap/UrlRewrite.cc | 2 +- proxy/http/remap/UrlRewrite.h | 4 ++-- proxy/http/testheaders.cc | 2 +- proxy/http2/HPACK.h | 2 +- proxy/http2/HTTP2.cc | 4 ++-- proxy/http2/HTTP2.h | 4 ++-- proxy/http2/Http2SessionAccept.h | 2 +- proxy/http2/HuffmanCodec.cc | 2 +- proxy/http2/Makefile.am | 2 -- proxy/logcat.cc | 4 ++-- proxy/logging/Log.cc | 6 +++--- proxy/logging/Log.h | 2 +- proxy/logging/LogAccess.cc | 2 +- proxy/logging/LogAccess.h | 2 +- proxy/logging/LogAccessHttp.cc | 2 +- proxy/logging/LogAccessHttp.h | 2 +- proxy/logging/LogAccessICP.cc | 2 +- proxy/logging/LogBuffer.cc | 2 +- proxy/logging/LogBuffer.h | 2 +- proxy/logging/LogCollationAccept.cc | 2 +- proxy/logging/LogCollationClientSM.cc | 2 +- proxy/logging/LogCollationHostSM.cc | 2 +- proxy/logging/LogConfig.cc | 12 ++++++------ proxy/logging/LogConfig.h | 2 +- proxy/logging/LogField.cc | 2 +- proxy/logging/LogField.h | 2 +- proxy/logging/LogFieldAliasMap.cc | 4 ++-- proxy/logging/LogFieldAliasMap.h | 6 +++--- proxy/logging/LogFile.cc | 2 +- proxy/logging/LogFile.h | 2 +- proxy/logging/LogFilter.cc | 6 +++--- proxy/logging/LogFilter.h | 4 ++-- proxy/logging/LogFormat.cc | 6 +++--- proxy/logging/LogFormat.h | 2 +- proxy/logging/LogHost.cc | 2 +- proxy/logging/LogObject.cc | 2 +- proxy/logging/LogObject.h | 2 +- proxy/logging/LogSock.h | 2 +- proxy/logging/LogStandalone.cc | 6 +++--- proxy/logging/LogUtils.cc | 2 +- proxy/logging/LogUtils.h | 4 ++-- proxy/logging/Makefile.am | 2 -- proxy/logstats.cc | 10 +++++----- proxy/sac.cc | 4 ++-- proxy/shared/DiagsConfig.cc | 4 ++-- proxy/shared/DiagsConfig.h | 2 +- proxy/shared/Error.cc | 2 +- proxy/shared/Error.h | 4 ++-- proxy/shared/InkXml.cc | 2 +- proxy/shared/InkXml.h | 2 +- proxy/shared/Makefile.am | 5 +---- proxy/shared/UglyLogStubs.cc | 2 +- proxy/spdy/Makefile.am | 2 -- proxy/test_xml_parser.cc | 2 +- tools/Makefile.am | 1 - tools/http_load/http_load.c | 2 +- tools/jtest/jtest.cc | 16 ++++++++-------- 430 files changed, 768 insertions(+), 836 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/build/plugins.mk ---------------------------------------------------------------------- diff --git a/build/plugins.mk b/build/plugins.mk index 4a23105..45c6957 100644 --- a/build/plugins.mk +++ b/build/plugins.mk @@ -25,7 +25,6 @@ TS_PLUGIN_LDFLAGS = \ TS_PLUGIN_CPPFLAGS = \ -I$(top_builddir)/proxy/api \ -I$(top_srcdir)/proxy/api \ - -I$(top_builddir)/lib \ -I$(top_srcdir)/lib # Provide a default AM_CPPFLAGS. Automake handles this correctly, but libtool http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/cmd/traffic_cop/Makefile.am ---------------------------------------------------------------------- diff --git a/cmd/traffic_cop/Makefile.am b/cmd/traffic_cop/Makefile.am index 74c4f6f..027180f 100644 --- a/cmd/traffic_cop/Makefile.am +++ b/cmd/traffic_cop/Makefile.am @@ -20,8 +20,6 @@ AM_CPPFLAGS = $(iocore_include_dirs) \ -I$(top_srcdir)/lib \ -I$(top_srcdir)/lib/records \ - -I$(top_srcdir)/lib/ts \ - -I$(top_builddir)/lib/ts \ -I$(top_srcdir)/mgmt \ -I$(top_srcdir)/mgmt/cluster \ -I$(top_srcdir)/mgmt/api/include http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/cmd/traffic_cop/traffic_cop.cc ---------------------------------------------------------------------- diff --git a/cmd/traffic_cop/traffic_cop.cc b/cmd/traffic_cop/traffic_cop.cc index e3476fe..dc275f1 100644 --- a/cmd/traffic_cop/traffic_cop.cc +++ b/cmd/traffic_cop/traffic_cop.cc @@ -21,14 +21,14 @@ limitations under the License. */ -#include "libts.h" -#include "I_Layout.h" -#include "I_Version.h" +#include "ts/libts.h" +#include "ts/I_Layout.h" +#include "ts/I_Version.h" #include "I_RecCore.h" #include "mgmtapi.h" #include "RecordsConfig.h" #include "ClusterCom.h" -#include "ink_cap.h" +#include "ts/ink_cap.h" #include <string> #include <map> http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/cmd/traffic_crashlog/Makefile.am ---------------------------------------------------------------------- diff --git a/cmd/traffic_crashlog/Makefile.am b/cmd/traffic_crashlog/Makefile.am index fa537a8..e127b65 100644 --- a/cmd/traffic_crashlog/Makefile.am +++ b/cmd/traffic_crashlog/Makefile.am @@ -20,8 +20,6 @@ bin_PROGRAMS = traffic_crashlog AM_CPPFLAGS = \ $(iocore_include_dirs) \ -I$(top_srcdir)/lib \ - -I$(top_srcdir)/lib/ts \ - -I$(top_builddir)/lib/ts \ -I$(top_srcdir)/lib/records \ -I$(top_srcdir)/mgmt \ -I$(top_srcdir)/mgmt/utils \ http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/cmd/traffic_crashlog/traffic_crashlog.cc ---------------------------------------------------------------------- diff --git a/cmd/traffic_crashlog/traffic_crashlog.cc b/cmd/traffic_crashlog/traffic_crashlog.cc index e35085f..9c9e13c 100644 --- a/cmd/traffic_crashlog/traffic_crashlog.cc +++ b/cmd/traffic_crashlog/traffic_crashlog.cc @@ -22,10 +22,10 @@ */ #include "traffic_crashlog.h" -#include "ink_args.h" -#include "ink_cap.h" -#include "I_Version.h" -#include "I_Layout.h" +#include "ts/ink_args.h" +#include "ts/ink_cap.h" +#include "ts/I_Version.h" +#include "ts/I_Layout.h" #include "I_RecProcess.h" #include "RecordsConfig.h" http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/cmd/traffic_crashlog/traffic_crashlog.h ---------------------------------------------------------------------- diff --git a/cmd/traffic_crashlog/traffic_crashlog.h b/cmd/traffic_crashlog/traffic_crashlog.h index 0b066d1..e5e6e5a 100644 --- a/cmd/traffic_crashlog/traffic_crashlog.h +++ b/cmd/traffic_crashlog/traffic_crashlog.h @@ -24,7 +24,7 @@ #ifndef __TRAFFIC_CRASHLOG_H__ #define __TRAFFIC_CRASHLOG_H__ -#include "libts.h" +#include "ts/libts.h" #include "mgmtapi.h" // ucontext.h is deprecated on Darwin, and we really only need it on Linux, so only http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/cmd/traffic_ctl/Makefile.am ---------------------------------------------------------------------- diff --git a/cmd/traffic_ctl/Makefile.am b/cmd/traffic_ctl/Makefile.am index cf471cc..5b7731b 100644 --- a/cmd/traffic_ctl/Makefile.am +++ b/cmd/traffic_ctl/Makefile.am @@ -20,8 +20,6 @@ AM_CPPFLAGS = \ $(iocore_include_dirs) \ -I$(top_srcdir)/lib \ - -I$(top_srcdir)/lib/ts \ - -I$(top_builddir)/lib/ts \ -I$(top_srcdir)/lib/records \ -I$(top_srcdir)/mgmt/api/include http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/cmd/traffic_ctl/traffic_ctl.h ---------------------------------------------------------------------- diff --git a/cmd/traffic_ctl/traffic_ctl.h b/cmd/traffic_ctl/traffic_ctl.h index b77ee40..5273e2b 100644 --- a/cmd/traffic_ctl/traffic_ctl.h +++ b/cmd/traffic_ctl/traffic_ctl.h @@ -24,10 +24,10 @@ #ifndef _TRAFFIC_CTRL_H_ #define _TRAFFIC_CTRL_H_ -#include "libts.h" +#include "ts/libts.h" #include "mgmtapi.h" -#include "ink_args.h" -#include "I_Version.h" +#include "ts/ink_args.h" +#include "ts/I_Version.h" #include <vector> http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/cmd/traffic_layout/Makefile.am ---------------------------------------------------------------------- diff --git a/cmd/traffic_layout/Makefile.am b/cmd/traffic_layout/Makefile.am index f0998ca..f0da43a 100644 --- a/cmd/traffic_layout/Makefile.am +++ b/cmd/traffic_layout/Makefile.am @@ -20,8 +20,6 @@ bin_PROGRAMS = traffic_layout AM_CPPFLAGS = \ $(iocore_include_dirs) \ -I$(top_srcdir)/lib \ - -I$(top_srcdir)/lib/ts \ - -I$(top_builddir)/lib/ts \ -I$(top_srcdir)/lib/records \ -I$(top_srcdir)/mgmt \ -I$(top_srcdir)/mgmt/utils http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/cmd/traffic_layout/traffic_layout.cc ---------------------------------------------------------------------- diff --git a/cmd/traffic_layout/traffic_layout.cc b/cmd/traffic_layout/traffic_layout.cc index 72d92c6..1f73e8d 100644 --- a/cmd/traffic_layout/traffic_layout.cc +++ b/cmd/traffic_layout/traffic_layout.cc @@ -21,11 +21,11 @@ limitations under the License. */ -#include "libts.h" -#include "ink_args.h" -#include "ink_config.h" -#include "I_Version.h" -#include "I_Layout.h" +#include "ts/libts.h" +#include "ts/ink_args.h" +#include "ts/ink_config.h" +#include "ts/I_Version.h" +#include "ts/I_Layout.h" #include "I_RecProcess.h" #include "RecordsConfig.h" http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/cmd/traffic_line/Makefile.am ---------------------------------------------------------------------- diff --git a/cmd/traffic_line/Makefile.am b/cmd/traffic_line/Makefile.am index 0bf778d..52f00ca 100644 --- a/cmd/traffic_line/Makefile.am +++ b/cmd/traffic_line/Makefile.am @@ -20,8 +20,6 @@ AM_CPPFLAGS = \ $(iocore_include_dirs) \ -I$(top_srcdir)/lib \ - -I$(top_srcdir)/lib/ts \ - -I$(top_builddir)/lib/ts \ -I$(top_srcdir)/mgmt/api/include AM_LDFLAGS = \ http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/cmd/traffic_line/traffic_line.cc ---------------------------------------------------------------------- diff --git a/cmd/traffic_line/traffic_line.cc b/cmd/traffic_line/traffic_line.cc index 0c10839..975de65 100644 --- a/cmd/traffic_line/traffic_line.cc +++ b/cmd/traffic_line/traffic_line.cc @@ -21,12 +21,12 @@ limitations under the License. */ -#include "libts.h" +#include "ts/libts.h" -#include "ink_args.h" -#include "I_Version.h" -#include "Tokenizer.h" -#include "TextBuffer.h" +#include "ts/ink_args.h" +#include "ts/I_Version.h" +#include "ts/Tokenizer.h" +#include "ts/TextBuffer.h" #include "mgmtapi.h" #include <stdio.h> #include <string.h> http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/cmd/traffic_manager/AddConfigFilesHere.cc ---------------------------------------------------------------------- diff --git a/cmd/traffic_manager/AddConfigFilesHere.cc b/cmd/traffic_manager/AddConfigFilesHere.cc index ea9066b..56b7aca 100644 --- a/cmd/traffic_manager/AddConfigFilesHere.cc +++ b/cmd/traffic_manager/AddConfigFilesHere.cc @@ -21,10 +21,10 @@ limitations under the License. */ -#include "ink_platform.h" +#include "ts/ink_platform.h" #include "MgmtUtils.h" #include "ConfigParse.h" -#include "Diags.h" +#include "ts/Diags.h" #include "FileManager.h" extern FileManager *configFiles; http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/cmd/traffic_manager/Makefile.am ---------------------------------------------------------------------- diff --git a/cmd/traffic_manager/Makefile.am b/cmd/traffic_manager/Makefile.am index 7046eef..04ada52 100644 --- a/cmd/traffic_manager/Makefile.am +++ b/cmd/traffic_manager/Makefile.am @@ -20,8 +20,6 @@ bin_PROGRAMS = traffic_manager AM_CPPFLAGS = \ $(iocore_include_dirs) \ -I$(top_srcdir)/lib/records \ - -I$(top_srcdir)/lib/ts \ - -I$(top_builddir)/lib/ts \ -I$(top_srcdir)/proxy \ -I$(top_srcdir)/proxy/hdrs \ -I$(top_srcdir)/proxy/shared \ @@ -30,8 +28,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/mgmt/api/include \ -I$(top_srcdir)/mgmt/cluster \ -I$(top_srcdir)/mgmt/utils \ - -I$(top_srcdir)/lib \ - -I$(top_builddir)/lib + -I$(top_srcdir)/lib AM_LDFLAGS = \ @EXTRA_CXX_LDFLAGS@ \ http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/cmd/traffic_manager/MgmtHandlers.cc ---------------------------------------------------------------------- diff --git a/cmd/traffic_manager/MgmtHandlers.cc b/cmd/traffic_manager/MgmtHandlers.cc index 2db9459..fe9bef2 100644 --- a/cmd/traffic_manager/MgmtHandlers.cc +++ b/cmd/traffic_manager/MgmtHandlers.cc @@ -27,8 +27,8 @@ * ****************************************************************************/ -#include "libts.h" -#include "I_Layout.h" +#include "ts/libts.h" +#include "ts/I_Layout.h" #include "LocalManager.h" #include "Alarms.h" #include "MgmtUtils.h" http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/cmd/traffic_manager/StatProcessor.cc ---------------------------------------------------------------------- diff --git a/cmd/traffic_manager/StatProcessor.cc b/cmd/traffic_manager/StatProcessor.cc index 9202aca..2784928 100644 --- a/cmd/traffic_manager/StatProcessor.cc +++ b/cmd/traffic_manager/StatProcessor.cc @@ -30,7 +30,7 @@ * ****************************************************************************/ -#include "libts.h" +#include "ts/libts.h" #include "StatProcessor.h" #include "FileManager.h" http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/cmd/traffic_manager/StatProcessor.h ---------------------------------------------------------------------- diff --git a/cmd/traffic_manager/StatProcessor.h b/cmd/traffic_manager/StatProcessor.h index c6b3dd8..0d3b751 100644 --- a/cmd/traffic_manager/StatProcessor.h +++ b/cmd/traffic_manager/StatProcessor.h @@ -32,12 +32,12 @@ * ****************************************************************************/ -#include "ink_platform.h" +#include "ts/ink_platform.h" #include <stdarg.h> #include "MgmtUtils.h" #include "MgmtDefs.h" #include "WebMgmtUtils.h" -#include "ink_hrtime.h" +#include "ts/ink_hrtime.h" #include "LocalManager.h" #include "WebOverview.h" http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/cmd/traffic_manager/StatType.cc ---------------------------------------------------------------------- diff --git a/cmd/traffic_manager/StatType.cc b/cmd/traffic_manager/StatType.cc index 11b1484..1e9a4d0 100644 --- a/cmd/traffic_manager/StatType.cc +++ b/cmd/traffic_manager/StatType.cc @@ -30,12 +30,12 @@ * ****************************************************************************/ -#include "ink_config.h" +#include "ts/ink_config.h" #include "StatType.h" #include "MgmtUtils.h" -#include "ink_hrtime.h" +#include "ts/ink_hrtime.h" #include "WebOverview.h" -#include "Tokenizer.h" +#include "ts/Tokenizer.h" bool StatError = false; // global error flag bool StatDebug = false; // global debug flag http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/cmd/traffic_manager/StatXML.cc ---------------------------------------------------------------------- diff --git a/cmd/traffic_manager/StatXML.cc b/cmd/traffic_manager/StatXML.cc index 1d6a7ba..bda2005 100644 --- a/cmd/traffic_manager/StatXML.cc +++ b/cmd/traffic_manager/StatXML.cc @@ -21,7 +21,7 @@ limitations under the License. */ -#include "ink_config.h" +#include "ts/ink_config.h" #include "StatXML.h" #include <stdlib.h> #include <ctype.h> http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/cmd/traffic_manager/StatXML.h ---------------------------------------------------------------------- diff --git a/cmd/traffic_manager/StatXML.h b/cmd/traffic_manager/StatXML.h index 249be2f..a7aa3f2 100644 --- a/cmd/traffic_manager/StatXML.h +++ b/cmd/traffic_manager/StatXML.h @@ -26,7 +26,7 @@ #define _STATXML_H_ #include "WebMgmtUtils.h" -#include "List.h" +#include "ts/List.h" typedef enum { INVALID_TAG = -1, http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/cmd/traffic_manager/WebOverview.cc ---------------------------------------------------------------------- diff --git a/cmd/traffic_manager/WebOverview.cc b/cmd/traffic_manager/WebOverview.cc index 252820d..b321b1c 100644 --- a/cmd/traffic_manager/WebOverview.cc +++ b/cmd/traffic_manager/WebOverview.cc @@ -28,7 +28,7 @@ * ****************************************************************************/ -#include "libts.h" +#include "ts/libts.h" #include "MgmtDefs.h" #include "WebOverview.h" @@ -38,7 +38,7 @@ #include "ClusterCom.h" #include "MgmtUtils.h" #include "MgmtDefs.h" -#include "Diags.h" +#include "ts/Diags.h" // Make this pointer to avoid nasty destruction // problems do to alarm http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/cmd/traffic_manager/WebOverview.h ---------------------------------------------------------------------- diff --git a/cmd/traffic_manager/WebOverview.h b/cmd/traffic_manager/WebOverview.h index 447cfa5..ee88cf1 100644 --- a/cmd/traffic_manager/WebOverview.h +++ b/cmd/traffic_manager/WebOverview.h @@ -24,10 +24,10 @@ #ifndef _WEB_OVERVIEW_H_ #define _WEB_OVERVIEW_H_ -#include "ink_hash_table.h" -#include "ink_mutex.h" -#include "TextBuffer.h" -#include "List.h" +#include "ts/ink_hash_table.h" +#include "ts/ink_mutex.h" +#include "ts/TextBuffer.h" +#include "ts/List.h" #include "ExpandingArray.h" #include "ClusterCom.h" http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/cmd/traffic_manager/traffic_manager.cc ---------------------------------------------------------------------- diff --git a/cmd/traffic_manager/traffic_manager.cc b/cmd/traffic_manager/traffic_manager.cc index 6714c62..a290c15 100644 --- a/cmd/traffic_manager/traffic_manager.cc +++ b/cmd/traffic_manager/traffic_manager.cc @@ -21,16 +21,16 @@ limitations under the License. */ -#include "ink_sys_control.h" -#include "ink_cap.h" +#include "ts/ink_sys_control.h" +#include "ts/ink_cap.h" #include "WebMgmtUtils.h" #include "NetworkUtilsRemote.h" #include "ClusterCom.h" #include "VMap.h" #include "FileManager.h" -#include "I_Layout.h" -#include "I_Version.h" +#include "ts/I_Layout.h" +#include "ts/I_Version.h" #include "DiagsConfig.h" #include "HTTP.h" #include "CoreAPI.h" http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/cmd/traffic_top/Makefile.am ---------------------------------------------------------------------- diff --git a/cmd/traffic_top/Makefile.am b/cmd/traffic_top/Makefile.am index 1fba7be..922e507 100644 --- a/cmd/traffic_top/Makefile.am +++ b/cmd/traffic_top/Makefile.am @@ -21,8 +21,6 @@ if BUILD_TRAFFIC_TOP AM_CPPFLAGS = \ $(iocore_include_dirs) \ -I$(top_srcdir)/lib \ - -I$(top_srcdir)/lib/ts \ - -I$(top_builddir)/lib/ts \ -I$(top_srcdir)/mgmt/api/include \ @CURL_CFLAGS@ http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/cmd/traffic_top/traffic_top.cc ---------------------------------------------------------------------- diff --git a/cmd/traffic_top/traffic_top.cc b/cmd/traffic_top/traffic_top.cc index df447c2..c50140a 100644 --- a/cmd/traffic_top/traffic_top.cc +++ b/cmd/traffic_top/traffic_top.cc @@ -21,7 +21,7 @@ limitations under the License. */ -#include "ink_config.h" +#include "ts/ink_config.h" #include <map> #include <list> #include <string> http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/cmd/traffic_via/Makefile.am ---------------------------------------------------------------------- diff --git a/cmd/traffic_via/Makefile.am b/cmd/traffic_via/Makefile.am index a5bc285..d09d8cc 100644 --- a/cmd/traffic_via/Makefile.am +++ b/cmd/traffic_via/Makefile.am @@ -20,8 +20,6 @@ AM_CPPFLAGS = \ $(iocore_include_dirs) \ -I$(top_srcdir)/lib \ - -I$(top_srcdir)/lib/ts \ - -I$(top_builddir)/lib/ts \ -I$(top_srcdir)/mgmt/api/include AM_LDFLAGS = \ http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/cmd/traffic_via/traffic_via.cc ---------------------------------------------------------------------- diff --git a/cmd/traffic_via/traffic_via.cc b/cmd/traffic_via/traffic_via.cc index 7426d1b..b329704 100644 --- a/cmd/traffic_via/traffic_via.cc +++ b/cmd/traffic_via/traffic_via.cc @@ -21,16 +21,16 @@ limitations under the License. */ -#include "libts.h" +#include "ts/libts.h" -#include "ink_args.h" -#include "I_Version.h" -#include "Tokenizer.h" -#include "TextBuffer.h" +#include "ts/ink_args.h" +#include "ts/I_Version.h" +#include "ts/Tokenizer.h" +#include "ts/TextBuffer.h" #include "mgmtapi.h" #include <stdio.h> #include <string.h> -#include "Regex.h" +#include "ts/Regex.h" /// XXX Use DFA or Regex wrappers? #ifdef HAVE_PCRE_PCRE_H http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/cmd/traffic_wccp/Makefile.am ---------------------------------------------------------------------- diff --git a/cmd/traffic_wccp/Makefile.am b/cmd/traffic_wccp/Makefile.am index f7b6148..12a66fd 100644 --- a/cmd/traffic_wccp/Makefile.am +++ b/cmd/traffic_wccp/Makefile.am @@ -21,7 +21,6 @@ AM_CPPFLAGS = $(iocore_include_dirs) \ -I$(top_srcdir)/lib \ -I$(top_srcdir)/lib/records \ - -I$(top_srcdir)/lib/ts \ -I$(top_srcdir)/lib/wccp \ @OPENSSL_INCLUDES@ http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/cmd/traffic_wccp/wccp_client.cc ---------------------------------------------------------------------- diff --git a/cmd/traffic_wccp/wccp_client.cc b/cmd/traffic_wccp/wccp_client.cc index 7d08fcb..312772c 100644 --- a/cmd/traffic_wccp/wccp_client.cc +++ b/cmd/traffic_wccp/wccp_client.cc @@ -36,11 +36,11 @@ #include <poll.h> -#include "ink_memory.h" +#include "ts/ink_memory.h" #include "Wccp.h" #include "WccpUtil.h" #include "tsconfig/TsValue.h" -#include "ink_lockfile.h" +#include "ts/ink_lockfile.h" #define WCCP_LOCK "wccp.pid" http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/example/session-1/session-1.c ---------------------------------------------------------------------- diff --git a/example/session-1/session-1.c b/example/session-1/session-1.c index 8f51c8a..bd1e761 100644 --- a/example/session-1/session-1.c +++ b/example/session-1/session-1.c @@ -31,7 +31,7 @@ #include <stdio.h> #include "ts/ts.h" -#include "ink_defs.h" +#include "ts/ink_defs.h" static INKStat transaction_count; static INKStat session_count; http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/iocore/aio/I_AIO.h ---------------------------------------------------------------------- diff --git a/iocore/aio/I_AIO.h b/iocore/aio/I_AIO.h index 806962d..ea765d2 100644 --- a/iocore/aio/I_AIO.h +++ b/iocore/aio/I_AIO.h @@ -31,7 +31,7 @@ #if !defined(_I_AIO_h_) #define _I_AIO_h_ -#include "libts.h" +#include "ts/libts.h" #include "I_EventSystem.h" #include "I_RecProcess.h" http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/iocore/aio/Makefile.am ---------------------------------------------------------------------- diff --git a/iocore/aio/Makefile.am b/iocore/aio/Makefile.am index bb9c1ca..b31ed3b 100644 --- a/iocore/aio/Makefile.am +++ b/iocore/aio/Makefile.am @@ -19,9 +19,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/iocore/eventsystem \ -I$(top_srcdir)/lib \ - -I$(top_srcdir)/lib/records \ - -I$(top_srcdir)/lib/ts \ - -I$(top_builddir)/lib/ts + -I$(top_srcdir)/lib/records TESTS = test_AIO.sample http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/iocore/aio/test_AIO.cc ---------------------------------------------------------------------- diff --git a/iocore/aio/test_AIO.cc b/iocore/aio/test_AIO.cc index 179e451..ae6cbe6 100644 --- a/iocore/aio/test_AIO.cc +++ b/iocore/aio/test_AIO.cc @@ -23,7 +23,7 @@ #include "P_AIO.h" #include "InkAPIInternal.h" -#include "I_Layout.h" +#include "ts/I_Layout.h" #include <iostream> #include <fstream> http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/iocore/cache/Cache.cc ---------------------------------------------------------------------- diff --git a/iocore/cache/Cache.cc b/iocore/cache/Cache.cc index bfc5f84..d0b5917 100644 --- a/iocore/cache/Cache.cc +++ b/iocore/cache/Cache.cc @@ -28,7 +28,7 @@ #include "P_CacheTest.h" #include "StatPages.h" -#include "I_Layout.h" +#include "ts/I_Layout.h" #ifdef HTTP_CACHE #include "HttpTransactCache.h" @@ -38,7 +38,7 @@ #include "P_CacheBC.h" #endif -#include "hugepages.h" +#include "ts/hugepages.h" // Compilation Options #define USELESS_REENABLES // allow them for now http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/iocore/cache/CacheDir.cc ---------------------------------------------------------------------- diff --git a/iocore/cache/CacheDir.cc b/iocore/cache/CacheDir.cc index 978bbfa..62c84de 100644 --- a/iocore/cache/CacheDir.cc +++ b/iocore/cache/CacheDir.cc @@ -24,13 +24,13 @@ #include "P_Cache.h" -#include "hugepages.h" +#include "ts/hugepages.h" // #define LOOP_CHECK_MODE 1 #ifdef LOOP_CHECK_MODE #define DIR_LOOP_THRESHOLD 1000 #endif -#include "ink_stack_trace.h" +#include "ts/ink_stack_trace.h" #define CACHE_INC_DIR_USED(_m) \ do { \ http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/iocore/cache/CacheHosting.cc ---------------------------------------------------------------------- diff --git a/iocore/cache/CacheHosting.cc b/iocore/cache/CacheHosting.cc index 6faa100..3281f79 100644 --- a/iocore/cache/CacheHosting.cc +++ b/iocore/cache/CacheHosting.cc @@ -22,7 +22,7 @@ */ #include "P_Cache.h" -#include "I_Layout.h" +#include "ts/I_Layout.h" extern int gndisks; http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/iocore/cache/CacheHttp.cc ---------------------------------------------------------------------- diff --git a/iocore/cache/CacheHttp.cc b/iocore/cache/CacheHttp.cc index 3d7dfba..d0d502f 100644 --- a/iocore/cache/CacheHttp.cc +++ b/iocore/cache/CacheHttp.cc @@ -21,7 +21,7 @@ limitations under the License. */ -#include "ink_config.h" +#include "ts/ink_config.h" #include <string.h> #include "P_Cache.h" http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/iocore/cache/I_Cache.h ---------------------------------------------------------------------- diff --git a/iocore/cache/I_Cache.h b/iocore/cache/I_Cache.h index 77aafe9..e41eecb 100644 --- a/iocore/cache/I_Cache.h +++ b/iocore/cache/I_Cache.h @@ -24,7 +24,7 @@ #ifndef _I_CACHE_H__ #define _I_CACHE_H__ -#include "libts.h" +#include "ts/libts.h" #include "I_EventSystem.h" #include "I_AIO.h" #include "I_CacheDefs.h" http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/iocore/cache/I_Store.h ---------------------------------------------------------------------- diff --git a/iocore/cache/I_Store.h b/iocore/cache/I_Store.h index b5f9721..800bddd 100644 --- a/iocore/cache/I_Store.h +++ b/iocore/cache/I_Store.h @@ -31,7 +31,7 @@ #ifndef _Store_h_ #define _Store_h_ -#include "libts.h" +#include "ts/libts.h" #define STORE_BLOCK_SIZE 8192 #define STORE_BLOCK_SHIFT 13 http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/iocore/cache/Makefile.am ---------------------------------------------------------------------- diff --git a/iocore/cache/Makefile.am b/iocore/cache/Makefile.am index 1e26a1e..2d4cced 100644 --- a/iocore/cache/Makefile.am +++ b/iocore/cache/Makefile.am @@ -20,8 +20,6 @@ AM_CPPFLAGS = \ $(iocore_include_dirs) \ -I$(top_srcdir)/lib \ -I$(top_srcdir)/lib/records \ - -I$(top_srcdir)/lib/ts \ - -I$(top_builddir)/lib/ts \ -I$(top_srcdir)/proxy/api/ts \ -I$(top_srcdir)/proxy \ -I$(top_srcdir)/proxy/hdrs \ http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/iocore/cache/P_Cache.h ---------------------------------------------------------------------- diff --git a/iocore/cache/P_Cache.h b/iocore/cache/P_Cache.h index ed738e3..def4bf0 100644 --- a/iocore/cache/P_Cache.h +++ b/iocore/cache/P_Cache.h @@ -24,7 +24,7 @@ #ifndef _P_CACHE_H__ #define _P_CACHE_H__ -#include "libts.h" +#include "ts/libts.h" #include "P_EventSystem.h" #include "P_AIO.h" #include "I_RecProcess.h" @@ -32,7 +32,7 @@ #ifdef HTTP_CACHE #include "HTTP.h" #include "MIME.h" -#include "MimeTable.h" +#include "ts/MimeTable.h" #include "HttpTransactCache.h" #endif http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/iocore/cache/P_CacheInternal.h ---------------------------------------------------------------------- diff --git a/iocore/cache/P_CacheInternal.h b/iocore/cache/P_CacheInternal.h index 4f91dbc..c607466 100644 --- a/iocore/cache/P_CacheInternal.h +++ b/iocore/cache/P_CacheInternal.h @@ -25,7 +25,7 @@ #ifndef _P_CACHE_INTERNAL_H__ #define _P_CACHE_INTERNAL_H__ -#include "libts.h" +#include "ts/libts.h" #ifdef HTTP_CACHE #include "HTTP.h" http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/iocore/cache/Store.cc ---------------------------------------------------------------------- diff --git a/iocore/cache/Store.cc b/iocore/cache/Store.cc index a3bd5f8..0ca6e84 100644 --- a/iocore/cache/Store.cc +++ b/iocore/cache/Store.cc @@ -21,9 +21,9 @@ limitations under the License. */ -#include "libts.h" +#include "ts/libts.h" #include "P_Cache.h" -#include "I_Layout.h" +#include "ts/I_Layout.h" #if HAVE_LINUX_MAJOR_H #include <linux/major.h> http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/iocore/cluster/ClusterMachine.cc ---------------------------------------------------------------------- diff --git a/iocore/cluster/ClusterMachine.cc b/iocore/cluster/ClusterMachine.cc index 2dee977..7173b11 100644 --- a/iocore/cluster/ClusterMachine.cc +++ b/iocore/cluster/ClusterMachine.cc @@ -26,10 +26,10 @@ Machine.cc ****************************************************************************/ -#include "ink_config.h" +#include "ts/ink_config.h" #include <unistd.h> #include "P_Cluster.h" -#include "I_Layout.h" +#include "ts/I_Layout.h" extern int num_of_cluster_threads; MachineList *machines_config = NULL; http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/iocore/cluster/Makefile.am ---------------------------------------------------------------------- diff --git a/iocore/cluster/Makefile.am b/iocore/cluster/Makefile.am index 8d526c6..9e7e400 100644 --- a/iocore/cluster/Makefile.am +++ b/iocore/cluster/Makefile.am @@ -20,8 +20,6 @@ AM_CPPFLAGS = \ $(iocore_include_dirs) \ -I$(top_srcdir)/lib \ -I$(top_srcdir)/lib/records \ - -I$(top_srcdir)/lib/ts \ - -I$(top_builddir)/lib/ts \ -I$(top_srcdir)/proxy/http \ -I$(top_srcdir)/proxy/hdrs \ -I$(top_srcdir)/proxy/api/ts \ http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/iocore/cluster/P_Cluster.h ---------------------------------------------------------------------- diff --git a/iocore/cluster/P_Cluster.h b/iocore/cluster/P_Cluster.h index 0376f63..7b6d1fe 100644 --- a/iocore/cluster/P_Cluster.h +++ b/iocore/cluster/P_Cluster.h @@ -24,7 +24,7 @@ #ifndef _P_CLUSTER_H__ #define _P_CLUSTER_H__ -#include "libts.h" +#include "ts/libts.h" #include "P_EventSystem.h" #include "I_RecProcess.h" #include "P_Net.h" http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/iocore/dns/Makefile.am ---------------------------------------------------------------------- diff --git a/iocore/dns/Makefile.am b/iocore/dns/Makefile.am index 46aa8d4..40c1ad3 100644 --- a/iocore/dns/Makefile.am +++ b/iocore/dns/Makefile.am @@ -20,8 +20,6 @@ AM_CPPFLAGS = \ $(iocore_include_dirs) \ -I$(top_srcdir)/lib \ -I$(top_srcdir)/lib/records \ - -I$(top_srcdir)/lib/ts \ - -I$(top_builddir)/lib/ts \ -I$(top_srcdir)/proxy \ -I$(top_srcdir)/proxy/http \ -I$(top_srcdir)/proxy/hdrs \ http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/iocore/dns/P_DNS.h ---------------------------------------------------------------------- diff --git a/iocore/dns/P_DNS.h b/iocore/dns/P_DNS.h index b37320e..e84f8a9 100644 --- a/iocore/dns/P_DNS.h +++ b/iocore/dns/P_DNS.h @@ -30,7 +30,7 @@ #if !defined(_P_DNS_h_) #define _P_DNS_h_ -#include "libts.h" +#include "ts/libts.h" #include "I_DNS.h" #include "P_EventSystem.h" #include "I_Cache.h" http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/iocore/dns/P_DNSProcessor.h ---------------------------------------------------------------------- diff --git a/iocore/dns/P_DNSProcessor.h b/iocore/dns/P_DNSProcessor.h index 411671e..b72f152 100644 --- a/iocore/dns/P_DNSProcessor.h +++ b/iocore/dns/P_DNSProcessor.h @@ -26,7 +26,7 @@ /* #include "I_DNS.h" - #include "libts.h" + #include "ts/libts.h" #include <arpa/nameser.h> #include "I_Cache.h" #include "P_Net.h" http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/iocore/dns/SRV.h ---------------------------------------------------------------------- diff --git a/iocore/dns/SRV.h b/iocore/dns/SRV.h index 45fe130..3329c1d 100644 --- a/iocore/dns/SRV.h +++ b/iocore/dns/SRV.h @@ -24,7 +24,7 @@ #ifndef _SRV_h_ #define _SRV_h_ -#include "libts.h" +#include "ts/libts.h" #include "I_HostDBProcessor.h" struct HostDBInfo; http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/iocore/dns/SplitDNS.cc ---------------------------------------------------------------------- diff --git a/iocore/dns/SplitDNS.cc b/iocore/dns/SplitDNS.cc index bb2bcdb..f8b4b61 100644 --- a/iocore/dns/SplitDNS.cc +++ b/iocore/dns/SplitDNS.cc @@ -28,13 +28,13 @@ * ****************************************************************************/ -#include "libts.h" +#include "ts/libts.h" #ifdef SPLIT_DNS #include <sys/types.h> #include "P_SplitDNS.h" -#include "MatcherUtils.h" -#include "HostLookup.h" +#include "ts/MatcherUtils.h" +#include "ts/HostLookup.h" /* -------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/iocore/eventsystem/IOBuffer.cc ---------------------------------------------------------------------- diff --git a/iocore/eventsystem/IOBuffer.cc b/iocore/eventsystem/IOBuffer.cc index 0c260a1..44535eb 100644 --- a/iocore/eventsystem/IOBuffer.cc +++ b/iocore/eventsystem/IOBuffer.cc @@ -25,7 +25,7 @@ UIOBuffer.cc **************************************************************************/ -#include "ink_defs.h" +#include "ts/ink_defs.h" #include "P_EventSystem.h" // http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/iocore/eventsystem/I_Action.h ---------------------------------------------------------------------- diff --git a/iocore/eventsystem/I_Action.h b/iocore/eventsystem/I_Action.h index f59fe3b..2987acb 100644 --- a/iocore/eventsystem/I_Action.h +++ b/iocore/eventsystem/I_Action.h @@ -25,7 +25,7 @@ #ifndef _I_Action_h_ #define _I_Action_h_ -#include "libts.h" +#include "ts/libts.h" #include "I_Thread.h" #include "I_Continuation.h" http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/iocore/eventsystem/I_Continuation.h ---------------------------------------------------------------------- diff --git a/iocore/eventsystem/I_Continuation.h b/iocore/eventsystem/I_Continuation.h index b2011c4..2015861 100644 --- a/iocore/eventsystem/I_Continuation.h +++ b/iocore/eventsystem/I_Continuation.h @@ -36,7 +36,7 @@ #ifndef _I_Continuation_h_ #define _I_Continuation_h_ -#include "libts.h" +#include "ts/libts.h" #include "I_Lock.h" class Continuation; http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/iocore/eventsystem/I_EThread.h ---------------------------------------------------------------------- diff --git a/iocore/eventsystem/I_EThread.h b/iocore/eventsystem/I_EThread.h index 0548ef4..3e7bed2 100644 --- a/iocore/eventsystem/I_EThread.h +++ b/iocore/eventsystem/I_EThread.h @@ -25,7 +25,7 @@ #ifndef _EThread_h_ #define _EThread_h_ -#include "libts.h" +#include "ts/libts.h" #include "I_Thread.h" #include "I_PriorityEventQueue.h" #include "I_ProtectedQueue.h" http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/iocore/eventsystem/I_Event.h ---------------------------------------------------------------------- diff --git a/iocore/eventsystem/I_Event.h b/iocore/eventsystem/I_Event.h index 05d6ee2..dc032dc 100644 --- a/iocore/eventsystem/I_Event.h +++ b/iocore/eventsystem/I_Event.h @@ -25,7 +25,7 @@ #ifndef _Event_h_ #define _Event_h_ -#include "libts.h" +#include "ts/libts.h" #include "I_Action.h" // http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/iocore/eventsystem/I_EventProcessor.h ---------------------------------------------------------------------- diff --git a/iocore/eventsystem/I_EventProcessor.h b/iocore/eventsystem/I_EventProcessor.h index 6cd53c8..45f9f2d 100644 --- a/iocore/eventsystem/I_EventProcessor.h +++ b/iocore/eventsystem/I_EventProcessor.h @@ -24,7 +24,7 @@ #ifndef _I_EventProcessor_h_ #define _I_EventProcessor_h_ -#include "libts.h" +#include "ts/libts.h" #include "I_Continuation.h" #include "I_Processor.h" #include "I_Event.h" http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/iocore/eventsystem/I_EventSystem.h ---------------------------------------------------------------------- diff --git a/iocore/eventsystem/I_EventSystem.h b/iocore/eventsystem/I_EventSystem.h index 5bfa2e0..9696890 100644 --- a/iocore/eventsystem/I_EventSystem.h +++ b/iocore/eventsystem/I_EventSystem.h @@ -25,7 +25,7 @@ #ifndef _I_EventSystem_h #define _I_EventSystem_h -#include "libts.h" +#include "ts/libts.h" #include "I_IOBuffer.h" #include "I_Action.h" http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/iocore/eventsystem/I_IOBuffer.h ---------------------------------------------------------------------- diff --git a/iocore/eventsystem/I_IOBuffer.h b/iocore/eventsystem/I_IOBuffer.h index 6416e2b..4037c99 100644 --- a/iocore/eventsystem/I_IOBuffer.h +++ b/iocore/eventsystem/I_IOBuffer.h @@ -39,8 +39,8 @@ #if !defined(I_IOBuffer_h) #define I_IOBuffer_h -#include "libts.h" -#include "ink_resource.h" +#include "ts/libts.h" +#include "ts/ink_resource.h" struct MIOBufferAccessor; http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/iocore/eventsystem/I_Lock.h ---------------------------------------------------------------------- diff --git a/iocore/eventsystem/I_Lock.h b/iocore/eventsystem/I_Lock.h index fe440ac..46e8cc2 100644 --- a/iocore/eventsystem/I_Lock.h +++ b/iocore/eventsystem/I_Lock.h @@ -24,7 +24,7 @@ #ifndef _I_Lock_h_ #define _I_Lock_h_ -#include "libts.h" +#include "ts/libts.h" #include "I_Thread.h" #define MAX_LOCK_TIME HRTIME_MSECONDS(200) http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/iocore/eventsystem/I_PriorityEventQueue.h ---------------------------------------------------------------------- diff --git a/iocore/eventsystem/I_PriorityEventQueue.h b/iocore/eventsystem/I_PriorityEventQueue.h index 3e649bc..69c7907 100644 --- a/iocore/eventsystem/I_PriorityEventQueue.h +++ b/iocore/eventsystem/I_PriorityEventQueue.h @@ -24,7 +24,7 @@ #ifndef _I_PriorityEventQueue_h_ #define _I_PriorityEventQueue_h_ -#include "libts.h" +#include "ts/libts.h" #include "I_Event.h" http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/iocore/eventsystem/I_Processor.h ---------------------------------------------------------------------- diff --git a/iocore/eventsystem/I_Processor.h b/iocore/eventsystem/I_Processor.h index a97fae7..ccea5da 100644 --- a/iocore/eventsystem/I_Processor.h +++ b/iocore/eventsystem/I_Processor.h @@ -25,7 +25,7 @@ #ifndef _I_Processor_h_ #define _I_Processor_h_ -#include "libts.h" +#include "ts/libts.h" #define PROCESSOR_RECONFIGURE 0x01 #define PROCESSOR_CHECK 0x02 http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/iocore/eventsystem/I_ProtectedQueue.h ---------------------------------------------------------------------- diff --git a/iocore/eventsystem/I_ProtectedQueue.h b/iocore/eventsystem/I_ProtectedQueue.h index 4d70e16..2f18991 100644 --- a/iocore/eventsystem/I_ProtectedQueue.h +++ b/iocore/eventsystem/I_ProtectedQueue.h @@ -35,7 +35,7 @@ #ifndef _I_ProtectedQueue_h_ #define _I_ProtectedQueue_h_ -#include "libts.h" +#include "ts/libts.h" #include "I_Event.h" struct ProtectedQueue { void enqueue(Event *e, bool fast_signal = false); http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/iocore/eventsystem/I_ProxyAllocator.h ---------------------------------------------------------------------- diff --git a/iocore/eventsystem/I_ProxyAllocator.h b/iocore/eventsystem/I_ProxyAllocator.h index 2e26fd5..fe75be4 100644 --- a/iocore/eventsystem/I_ProxyAllocator.h +++ b/iocore/eventsystem/I_ProxyAllocator.h @@ -31,7 +31,7 @@ #ifndef _I_ProxyAllocator_h_ #define _I_ProxyAllocator_h_ -#include "libts.h" +#include "ts/libts.h" class EThread; http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/iocore/eventsystem/I_SocketManager.h ---------------------------------------------------------------------- diff --git a/iocore/eventsystem/I_SocketManager.h b/iocore/eventsystem/I_SocketManager.h index 34b71a6..2e0e4c1 100644 --- a/iocore/eventsystem/I_SocketManager.h +++ b/iocore/eventsystem/I_SocketManager.h @@ -33,7 +33,7 @@ #ifndef _I_SocketManager_h_ #define _I_SocketManager_h_ -#include "libts.h" +#include "ts/libts.h" #include "I_EventSystem.h" #include "I_Thread.h" http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/iocore/eventsystem/I_Thread.h ---------------------------------------------------------------------- diff --git a/iocore/eventsystem/I_Thread.h b/iocore/eventsystem/I_Thread.h index 9d74b69..dc5ba12 100644 --- a/iocore/eventsystem/I_Thread.h +++ b/iocore/eventsystem/I_Thread.h @@ -64,7 +64,7 @@ -- - include I_Event.h or P_Event.h #endif -#include "libts.h" +#include "ts/libts.h" #include "I_ProxyAllocator.h" class Thread; class ProxyMutex; http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/iocore/eventsystem/I_VConnection.h ---------------------------------------------------------------------- diff --git a/iocore/eventsystem/I_VConnection.h b/iocore/eventsystem/I_VConnection.h index a9b0469..ef7a628 100644 --- a/iocore/eventsystem/I_VConnection.h +++ b/iocore/eventsystem/I_VConnection.h @@ -25,7 +25,7 @@ #if !defined(_I_VConnection_h_) #define _I_VConnection_h_ -#include "libts.h" +#include "ts/libts.h" #include "I_EventSystem.h" #if !defined(I_VIO_h) #error "include I_VIO.h" http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/iocore/eventsystem/I_VIO.h ---------------------------------------------------------------------- diff --git a/iocore/eventsystem/I_VIO.h b/iocore/eventsystem/I_VIO.h index 8d8bf97..b5a2197 100644 --- a/iocore/eventsystem/I_VIO.h +++ b/iocore/eventsystem/I_VIO.h @@ -25,14 +25,14 @@ #if !defined(I_VIO_h) #define I_VIO_h -#include "libts.h" +#include "ts/libts.h" #include "I_EventSystem.h" #if !defined(I_IOBuffer_h) #error "include I_IOBuffer.h" -- - include I_IOBuffer.h #endif -#include "ink_apidefs.h" +#include "ts/ink_apidefs.h" class Continuation; class VConnection; class IOVConnection; http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/iocore/eventsystem/Lock.cc ---------------------------------------------------------------------- diff --git a/iocore/eventsystem/Lock.cc b/iocore/eventsystem/Lock.cc index 855a1b2..098884c 100644 --- a/iocore/eventsystem/Lock.cc +++ b/iocore/eventsystem/Lock.cc @@ -29,7 +29,7 @@ **************************************************************************/ #include "P_EventSystem.h" -#include "Diags.h" +#include "ts/Diags.h" ClassAllocator<ProxyMutex> mutexAllocator("mutexAllocator"); http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/iocore/eventsystem/Makefile.am ---------------------------------------------------------------------- diff --git a/iocore/eventsystem/Makefile.am b/iocore/eventsystem/Makefile.am index 5dc3b57..ce0b9aa 100644 --- a/iocore/eventsystem/Makefile.am +++ b/iocore/eventsystem/Makefile.am @@ -18,9 +18,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/lib \ - -I$(top_srcdir)/lib/records \ - -I$(top_srcdir)/lib/ts \ - -I$(top_builddir)/lib/ts + -I$(top_srcdir)/lib/records TESTS = $(check_PROGRAMS) http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/iocore/eventsystem/P_EventSystem.h ---------------------------------------------------------------------- diff --git a/iocore/eventsystem/P_EventSystem.h b/iocore/eventsystem/P_EventSystem.h index 26f9680..d24e053 100644 --- a/iocore/eventsystem/P_EventSystem.h +++ b/iocore/eventsystem/P_EventSystem.h @@ -31,7 +31,7 @@ #ifndef _P_EventSystem_h #define _P_EventSystem_h -#include "libts.h" +#include "ts/libts.h" #include "I_EventSystem.h" http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/iocore/eventsystem/P_Freer.h ---------------------------------------------------------------------- diff --git a/iocore/eventsystem/P_Freer.h b/iocore/eventsystem/P_Freer.h index e3f29f7..f48afd0 100644 --- a/iocore/eventsystem/P_Freer.h +++ b/iocore/eventsystem/P_Freer.h @@ -24,7 +24,7 @@ #if !defined(_P_Freer_h_) #define _P_Freer_h_ -#include "libts.h" +#include "ts/libts.h" #include "I_Tasks.h" // Note that these should not be used for memory that wishes to retain http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/iocore/eventsystem/P_IOBuffer.h ---------------------------------------------------------------------- diff --git a/iocore/eventsystem/P_IOBuffer.h b/iocore/eventsystem/P_IOBuffer.h index 4a64972..7af9cdb 100644 --- a/iocore/eventsystem/P_IOBuffer.h +++ b/iocore/eventsystem/P_IOBuffer.h @@ -25,8 +25,8 @@ #if !defined(_P_IOBuffer_h) #define _P_IOBuffer_h -#include "libts.h" -#include "ink_resource.h" +#include "ts/libts.h" +#include "ts/ink_resource.h" // TODO: I think we're overly aggressive here on making MIOBuffer 64-bit http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/iocore/eventsystem/P_UnixSocketManager.h ---------------------------------------------------------------------- diff --git a/iocore/eventsystem/P_UnixSocketManager.h b/iocore/eventsystem/P_UnixSocketManager.h index 280bd61..210b5e4 100644 --- a/iocore/eventsystem/P_UnixSocketManager.h +++ b/iocore/eventsystem/P_UnixSocketManager.h @@ -32,7 +32,7 @@ #ifndef _P_UnixSocketManager_h_ #define _P_UnixSocketManager_h_ -#include "libts.h" +#include "ts/libts.h" #include "I_SocketManager.h" http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/iocore/eventsystem/SocketManager.cc ---------------------------------------------------------------------- diff --git a/iocore/eventsystem/SocketManager.cc b/iocore/eventsystem/SocketManager.cc index 65af386..80b2adc 100644 --- a/iocore/eventsystem/SocketManager.cc +++ b/iocore/eventsystem/SocketManager.cc @@ -25,7 +25,7 @@ SocketManager.cc ****************************************************************************/ -#include "libts.h" +#include "ts/libts.h" #include "P_EventSystem.h" SocketManager socketManager; http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/iocore/eventsystem/UnixEventProcessor.cc ---------------------------------------------------------------------- diff --git a/iocore/eventsystem/UnixEventProcessor.cc b/iocore/eventsystem/UnixEventProcessor.cc index 9932472..204ce21 100644 --- a/iocore/eventsystem/UnixEventProcessor.cc +++ b/iocore/eventsystem/UnixEventProcessor.cc @@ -27,7 +27,7 @@ #include <alloca.h> #include <hwloc.h> #endif -#include "ink_defs.h" +#include "ts/ink_defs.h" EventType EventProcessor::spawn_event_threads(int n_threads, const char *et_name, size_t stacksize) http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/iocore/eventsystem/test_Buffer.cc ---------------------------------------------------------------------- diff --git a/iocore/eventsystem/test_Buffer.cc b/iocore/eventsystem/test_Buffer.cc index 1826c76..7465add 100644 --- a/iocore/eventsystem/test_Buffer.cc +++ b/iocore/eventsystem/test_Buffer.cc @@ -22,7 +22,7 @@ */ #include "I_EventSystem.h" -#include "I_Layout.h" +#include "ts/I_Layout.h" #define TEST_TIME_SECOND 60 #define TEST_THREADS 2 http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/iocore/eventsystem/test_Event.cc ---------------------------------------------------------------------- diff --git a/iocore/eventsystem/test_Event.cc b/iocore/eventsystem/test_Event.cc index 5dbab87..9af7e88 100644 --- a/iocore/eventsystem/test_Event.cc +++ b/iocore/eventsystem/test_Event.cc @@ -22,7 +22,7 @@ */ #include "I_EventSystem.h" -#include "I_Layout.h" +#include "ts/I_Layout.h" #define TEST_TIME_SECOND 60 #define TEST_THREADS 2 http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/iocore/hostdb/HostDB.cc ---------------------------------------------------------------------- diff --git a/iocore/hostdb/HostDB.cc b/iocore/hostdb/HostDB.cc index f0319aa..6ed6937 100644 --- a/iocore/hostdb/HostDB.cc +++ b/iocore/hostdb/HostDB.cc @@ -24,7 +24,7 @@ #define _HOSTDB_CC_ #include "P_HostDB.h" -#include "I_Layout.h" +#include "ts/I_Layout.h" #include "Show.h" #include <vector> @@ -35,7 +35,7 @@ //#define Warning //#define Note -#include "ink_apidefs.h" +#include "ts/ink_apidefs.h" HostDBProcessor hostDBProcessor; int HostDBProcessor::hostdb_strict_round_robin = 0; http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/iocore/hostdb/Makefile.am ---------------------------------------------------------------------- diff --git a/iocore/hostdb/Makefile.am b/iocore/hostdb/Makefile.am index 98c0414..cf8956d 100644 --- a/iocore/hostdb/Makefile.am +++ b/iocore/hostdb/Makefile.am @@ -20,8 +20,6 @@ AM_CPPFLAGS = \ $(iocore_include_dirs) \ -I$(top_srcdir)/lib \ -I$(top_srcdir)/lib/records \ - -I$(top_srcdir)/lib/ts \ - -I$(top_builddir)/lib/ts \ -I$(top_srcdir)/proxy \ -I$(top_srcdir)/proxy/hdrs \ -I$(top_srcdir)/proxy/http \ http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/iocore/hostdb/MultiCache.cc ---------------------------------------------------------------------- diff --git a/iocore/hostdb/MultiCache.cc b/iocore/hostdb/MultiCache.cc index 2b37be1..ba5ae89 100644 --- a/iocore/hostdb/MultiCache.cc +++ b/iocore/hostdb/MultiCache.cc @@ -28,12 +28,12 @@ ****************************************************************************/ -#include "libts.h" -#include "I_Layout.h" +#include "ts/libts.h" +#include "ts/I_Layout.h" #include "P_HostDB.h" #include "P_MultiCache.h" #include "P_EventSystem.h" // FIXME: need to have this in I_* header files. -#include "ink_file.h" +#include "ts/ink_file.h" static const int MC_SYNC_MIN_PAUSE_TIME = HRTIME_MSECONDS(200); // Pause for at least 200ms http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/iocore/hostdb/P_HostDB.h ---------------------------------------------------------------------- diff --git a/iocore/hostdb/P_HostDB.h b/iocore/hostdb/P_HostDB.h index c78e051..8026cf5 100644 --- a/iocore/hostdb/P_HostDB.h +++ b/iocore/hostdb/P_HostDB.h @@ -31,7 +31,7 @@ #ifndef _P_HostDB_h_ #define _P_HostDB_h_ -#include "libts.h" +#include "ts/libts.h" #ifdef SPLIT_DNS #include "P_SplitDNS.h" http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/iocore/net/Connection.cc ---------------------------------------------------------------------- diff --git a/iocore/net/Connection.cc b/iocore/net/Connection.cc index 508131a..4f90509 100644 --- a/iocore/net/Connection.cc +++ b/iocore/net/Connection.cc @@ -27,7 +27,7 @@ Commonality across all platforms -- move out as required. **************************************************************************/ -#include "libts.h" +#include "ts/libts.h" #include "P_Net.h" http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/iocore/net/I_Net.h ---------------------------------------------------------------------- diff --git a/iocore/net/I_Net.h b/iocore/net/I_Net.h index 7573bcb..06d2d93 100644 --- a/iocore/net/I_Net.h +++ b/iocore/net/I_Net.h @@ -41,7 +41,7 @@ #ifndef __I_NET_H_ #define __I_NET_H_ -#include "I_Version.h" +#include "ts/I_Version.h" #include "I_EventSystem.h" #include <netinet/in.h> http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/iocore/net/I_NetVConnection.h ---------------------------------------------------------------------- diff --git a/iocore/net/I_NetVConnection.h b/iocore/net/I_NetVConnection.h index e9697be..9940a30 100644 --- a/iocore/net/I_NetVConnection.h +++ b/iocore/net/I_NetVConnection.h @@ -28,7 +28,7 @@ #include "I_Action.h" #include "I_VConnection.h" #include "I_Event.h" -#include "List.h" +#include "ts/List.h" #include "I_IOBuffer.h" #include "I_Socks.h" #include <ts/apidefs.h> http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/iocore/net/I_UDPNet.h ---------------------------------------------------------------------- diff --git a/iocore/net/I_UDPNet.h b/iocore/net/I_UDPNet.h index a3d1588..6f8fe6f 100644 --- a/iocore/net/I_UDPNet.h +++ b/iocore/net/I_UDPNet.h @@ -32,9 +32,9 @@ #ifndef __UDPNET_H_ #define __UDPNET_H_ -#include "I_Version.h" +#include "ts/I_Version.h" #include "I_EventSystem.h" -#include "ink_inet.h" +#include "ts/ink_inet.h" /** UDP service http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/iocore/net/Makefile.am ---------------------------------------------------------------------- diff --git a/iocore/net/Makefile.am b/iocore/net/Makefile.am index 7c4b440..888d3c2 100644 --- a/iocore/net/Makefile.am +++ b/iocore/net/Makefile.am @@ -20,8 +20,6 @@ AM_CPPFLAGS = \ $(iocore_include_dirs) \ -I$(top_srcdir)/lib \ -I$(top_srcdir)/lib/records \ - -I$(top_srcdir)/lib/ts \ - -I$(top_builddir)/lib/ts \ -I$(top_srcdir)/proxy \ -I$(top_srcdir)/proxy/hdrs \ -I$(top_srcdir)/proxy/shared \ http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/iocore/net/P_Connection.h ---------------------------------------------------------------------- diff --git a/iocore/net/P_Connection.h b/iocore/net/P_Connection.h index 84d0d70..8783f9b 100644 --- a/iocore/net/P_Connection.h +++ b/iocore/net/P_Connection.h @@ -50,7 +50,7 @@ #ifndef __CONNECTION_H__ #define __CONNECTION_H__ -#include "libts.h" +#include "ts/libts.h" struct NetVCOptions; http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/iocore/net/P_Net.h ---------------------------------------------------------------------- diff --git a/iocore/net/P_Net.h b/iocore/net/P_Net.h index 78aac91..7d63499 100644 --- a/iocore/net/P_Net.h +++ b/iocore/net/P_Net.h @@ -87,7 +87,7 @@ extern RecRawStatBlock *net_rsb; #define NET_SUM_GLOBAL_DYN_STAT(_x, _r) RecIncrGlobalRawStatSum(net_rsb, (_x), (_r)) #define NET_READ_GLOBAL_DYN_SUM(_x, _sum) RecGetGlobalRawStatSum(net_rsb, _x, &_sum) -#include "libts.h" +#include "ts/libts.h" #include "P_EventSystem.h" #include "I_Net.h" #include "P_NetVConnection.h" http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/iocore/net/P_NetAccept.h ---------------------------------------------------------------------- diff --git a/iocore/net/P_NetAccept.h b/iocore/net/P_NetAccept.h index 14a844a..8e43164 100644 --- a/iocore/net/P_NetAccept.h +++ b/iocore/net/P_NetAccept.h @@ -39,7 +39,7 @@ #ifndef __P_NETACCEPT_H__ #define __P_NETACCEPT_H__ -#include "libts.h" +#include "ts/libts.h" #include "P_Connection.h" http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/iocore/net/P_NetVCTest.h ---------------------------------------------------------------------- diff --git a/iocore/net/P_NetVCTest.h b/iocore/net/P_NetVCTest.h index bf7f9f3..855caf5 100644 --- a/iocore/net/P_NetVCTest.h +++ b/iocore/net/P_NetVCTest.h @@ -37,7 +37,7 @@ #ifndef _P_NET_VC_TEST_H_ #define _P_NET_VC_TEST_H_ -#include "libts.h" +#include "ts/libts.h" class VIO; class MIOBuffer; http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/iocore/net/P_SSLClientUtils.h ---------------------------------------------------------------------- diff --git a/iocore/net/P_SSLClientUtils.h b/iocore/net/P_SSLClientUtils.h index b0a1404..0b94df4 100644 --- a/iocore/net/P_SSLClientUtils.h +++ b/iocore/net/P_SSLClientUtils.h @@ -22,8 +22,8 @@ #ifndef IOCORE_NET_P_SSLCLIENTUTILS_H_ #define IOCORE_NET_P_SSLCLIENTUTILS_H_ -#include "ink_config.h" -#include "Diags.h" +#include "ts/ink_config.h" +#include "ts/Diags.h" #include "P_SSLUtils.h" #include "P_SSLConfig.h" http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/iocore/net/P_SSLNetAccept.h ---------------------------------------------------------------------- diff --git a/iocore/net/P_SSLNetAccept.h b/iocore/net/P_SSLNetAccept.h index 71e8689..7533564 100644 --- a/iocore/net/P_SSLNetAccept.h +++ b/iocore/net/P_SSLNetAccept.h @@ -39,7 +39,7 @@ #if !defined(_SSLNetAccept_h_) #define _SSLNetAccept_h_ -#include "libts.h" +#include "ts/libts.h" #include "P_Connection.h" #include "P_NetAccept.h" http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/iocore/net/P_SSLNetProcessor.h ---------------------------------------------------------------------- diff --git a/iocore/net/P_SSLNetProcessor.h b/iocore/net/P_SSLNetProcessor.h index ec008dd..89e09a1 100644 --- a/iocore/net/P_SSLNetProcessor.h +++ b/iocore/net/P_SSLNetProcessor.h @@ -32,7 +32,7 @@ #ifndef __P_SSLNETPROCESSOR_H #define __P_SSLNETPROCESSOR_H -#include "libts.h" +#include "ts/libts.h" #include "P_Net.h" #include "P_SSLConfig.h" #include <openssl/ssl.h> http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/iocore/net/P_SSLNetVConnection.h ---------------------------------------------------------------------- diff --git a/iocore/net/P_SSLNetVConnection.h b/iocore/net/P_SSLNetVConnection.h index 3b29e7b..fd09a18 100644 --- a/iocore/net/P_SSLNetVConnection.h +++ b/iocore/net/P_SSLNetVConnection.h @@ -32,11 +32,11 @@ #if !defined(_SSLNetVConnection_h_) #define _SSLNetVConnection_h_ -#include "libts.h" +#include "ts/libts.h" #include "P_EventSystem.h" #include "P_UnixNetVConnection.h" #include "P_UnixNet.h" -#include "apidefs.h" +#include "ts/apidefs.h" #include <openssl/ssl.h> #include <openssl/err.h> http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/iocore/net/P_SSLNextProtocolSet.h ---------------------------------------------------------------------- diff --git a/iocore/net/P_SSLNextProtocolSet.h b/iocore/net/P_SSLNextProtocolSet.h index fd38c15..9a04370 100644 --- a/iocore/net/P_SSLNextProtocolSet.h +++ b/iocore/net/P_SSLNextProtocolSet.h @@ -24,7 +24,7 @@ #ifndef P_SSLNextProtocolSet_H_ #define P_SSLNextProtocolSet_H_ -#include "List.h" +#include "ts/List.h" #include "I_Net.h" class Continuation; http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/iocore/net/P_SSLUtils.h ---------------------------------------------------------------------- diff --git a/iocore/net/P_SSLUtils.h b/iocore/net/P_SSLUtils.h index 57edf03..cc58e58 100644 --- a/iocore/net/P_SSLUtils.h +++ b/iocore/net/P_SSLUtils.h @@ -22,8 +22,8 @@ #ifndef __P_SSLUTILS_H__ #define __P_SSLUTILS_H__ -#include "ink_config.h" -#include "Diags.h" +#include "ts/ink_config.h" +#include "ts/Diags.h" #include "P_SSLClientUtils.h" #define OPENSSL_THREAD_DEFINES http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/iocore/net/P_UnixNet.h ---------------------------------------------------------------------- diff --git a/iocore/net/P_UnixNet.h b/iocore/net/P_UnixNet.h index 53e4e75..1363535 100644 --- a/iocore/net/P_UnixNet.h +++ b/iocore/net/P_UnixNet.h @@ -24,7 +24,7 @@ #ifndef __P_UNIXNET_H__ #define __P_UNIXNET_H__ -#include "libts.h" +#include "ts/libts.h" #define USE_EDGE_TRIGGER_EPOLL 1 #define USE_EDGE_TRIGGER_KQUEUE 1 http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/iocore/net/P_UnixNetState.h ---------------------------------------------------------------------- diff --git a/iocore/net/P_UnixNetState.h b/iocore/net/P_UnixNetState.h index efffe8f..5bdb6d0 100644 --- a/iocore/net/P_UnixNetState.h +++ b/iocore/net/P_UnixNetState.h @@ -40,7 +40,7 @@ #if !defined(_UnixNetState_h_) #define _UnixNetState_h_ -#include "List.h" +#include "ts/List.h" #include "I_VIO.h" class Event; http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/iocore/net/P_UnixNetVConnection.h ---------------------------------------------------------------------- diff --git a/iocore/net/P_UnixNetVConnection.h b/iocore/net/P_UnixNetVConnection.h index 52f5335..92bfeac 100644 --- a/iocore/net/P_UnixNetVConnection.h +++ b/iocore/net/P_UnixNetVConnection.h @@ -32,7 +32,7 @@ #ifndef __P_UNIXNETVCONNECTION_H__ #define __P_UNIXNETVCONNECTION_H__ -#include "ink_sock.h" +#include "ts/ink_sock.h" #include "I_NetVConnection.h" #include "P_UnixNetState.h" #include "P_Connection.h" http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/iocore/net/P_UnixPollDescriptor.h ---------------------------------------------------------------------- diff --git a/iocore/net/P_UnixPollDescriptor.h b/iocore/net/P_UnixPollDescriptor.h index 88b8f38..d56213b 100644 --- a/iocore/net/P_UnixPollDescriptor.h +++ b/iocore/net/P_UnixPollDescriptor.h @@ -30,7 +30,7 @@ #ifndef __P_UNIXPOLLDESCRIPTOR_H__ #define __P_UNIXPOLLDESCRIPTOR_H__ -#include "libts.h" +#include "ts/libts.h" #if TS_USE_KQUEUE #include <sys/event.h> http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/iocore/net/SSLCertLookup.cc ---------------------------------------------------------------------- diff --git a/iocore/net/SSLCertLookup.cc b/iocore/net/SSLCertLookup.cc index d6b76bc..c7f3a8f 100644 --- a/iocore/net/SSLCertLookup.cc +++ b/iocore/net/SSLCertLookup.cc @@ -21,15 +21,15 @@ limitations under the License. */ -#include "ink_config.h" +#include "ts/ink_config.h" #include "P_SSLCertLookup.h" #include "P_SSLUtils.h" #include "P_SSLConfig.h" #include "I_EventSystem.h" -#include "I_Layout.h" -#include "Regex.h" -#include "Trie.h" +#include "ts/I_Layout.h" +#include "ts/Regex.h" +#include "ts/Trie.h" #include "ts/TestBox.h" struct SSLAddressLookupKey { http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/iocore/net/SSLClientUtils.cc ---------------------------------------------------------------------- diff --git a/iocore/net/SSLClientUtils.cc b/iocore/net/SSLClientUtils.cc index 6c22946..7971b66 100644 --- a/iocore/net/SSLClientUtils.cc +++ b/iocore/net/SSLClientUtils.cc @@ -19,9 +19,9 @@ limitations under the License. */ -#include "ink_config.h" +#include "ts/ink_config.h" #include "records/I_RecHttp.h" -#include "libts.h" +#include "ts/libts.h" #include "P_Net.h" #include "P_SSLClientUtils.h" http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/iocore/net/SSLConfig.cc ---------------------------------------------------------------------- diff --git a/iocore/net/SSLConfig.cc b/iocore/net/SSLConfig.cc index a4d7a7f..611d757 100644 --- a/iocore/net/SSLConfig.cc +++ b/iocore/net/SSLConfig.cc @@ -29,8 +29,8 @@ SSL Configurations ****************************************************************************/ -#include "libts.h" -#include "I_Layout.h" +#include "ts/libts.h" +#include "ts/I_Layout.h" #include <string.h> #include "P_Net.h" http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/iocore/net/SSLDynlock.cc ---------------------------------------------------------------------- diff --git a/iocore/net/SSLDynlock.cc b/iocore/net/SSLDynlock.cc index 4d75efc..1ce9aa8 100644 --- a/iocore/net/SSLDynlock.cc +++ b/iocore/net/SSLDynlock.cc @@ -19,7 +19,7 @@ limitations under the License. */ -#include "libts.h" +#include "ts/libts.h" struct CRYPTO_dynlock_value { CRYPTO_dynlock_value(const char *f, int l) : file(f), line(l) { pthread_mutex_init(&mutex, NULL); } http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/iocore/net/SSLInternal.cc ---------------------------------------------------------------------- diff --git a/iocore/net/SSLInternal.cc b/iocore/net/SSLInternal.cc index ddfa36e..deaf70e 100644 --- a/iocore/net/SSLInternal.cc +++ b/iocore/net/SSLInternal.cc @@ -21,7 +21,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -#include <ink_config.h> +#include "ts/ink_config.h" #if TS_USE_SET_RBIO // No need to do anything, this version of openssl provides the SSL_set_rbio function #else http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/iocore/net/SSLNetAccept.cc ---------------------------------------------------------------------- diff --git a/iocore/net/SSLNetAccept.cc b/iocore/net/SSLNetAccept.cc index 675e0a9..1b17ad3 100644 --- a/iocore/net/SSLNetAccept.cc +++ b/iocore/net/SSLNetAccept.cc @@ -19,7 +19,7 @@ limitations under the License. */ -#include "ink_config.h" +#include "ts/ink_config.h" #include "P_Net.h" typedef int (SSLNetAccept::*SSLNetAcceptHandler)(int, void *); http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/iocore/net/SSLNetProcessor.cc ---------------------------------------------------------------------- diff --git a/iocore/net/SSLNetProcessor.cc b/iocore/net/SSLNetProcessor.cc index 3e579cf..a79f374 100644 --- a/iocore/net/SSLNetProcessor.cc +++ b/iocore/net/SSLNetProcessor.cc @@ -19,10 +19,10 @@ limitations under the License. */ -#include "ink_config.h" +#include "ts/ink_config.h" #include "P_Net.h" -#include "I_Layout.h" +#include "ts/I_Layout.h" #include "I_RecHttp.h" #include "P_SSLUtils.h" #include "P_OCSPStapling.h"
