From: Amos Jeffries Date: Mon, 19 Jun 2017 13:53:03 +0000 (+1200) Subject: Fix build errors with automake after rev.15194 X-Git-Tag: M-staged-PR71~104 X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=e16571ede326d61db0e898441c0ba8588c909b88;p=thirdparty%2Fsquid.git Fix build errors with automake after rev.15194 We cannot name files in src/ the same as files in sub-directories due to certain automake still implicitly using -I. for search paths. --- diff --git a/src/HttpRequest.h b/src/HttpRequest.h index 3aec5fd9fd..0d8b2ca8f2 100644 --- a/src/HttpRequest.h +++ b/src/HttpRequest.h @@ -12,10 +12,10 @@ #include "base/CbcPointer.h" #include "dns/forward.h" #include "err_type.h" -#include "forward.h" #include "HierarchyLogEntry.h" #include "http/Message.h" #include "http/RequestMethod.h" +#include "MasterXaction.h" #include "Notes.h" #include "RequestFlags.h" #include "URL.h" @@ -51,8 +51,8 @@ class HttpRequest: public Http::Message public: typedef RefCount Pointer; - HttpRequest(const MasterXactionPointer &); - HttpRequest(const HttpRequestMethod& aMethod, AnyP::ProtocolType aProtocol, const char *schemeImage, const char *aUrlpath, const MasterXactionPointer &); + HttpRequest(const MasterXaction::Pointer &); + HttpRequest(const HttpRequestMethod& aMethod, AnyP::ProtocolType aProtocol, const char *schemeImage, const char *aUrlpath, const MasterXaction::Pointer &); ~HttpRequest(); virtual void reset(); @@ -199,7 +199,7 @@ public: static void httpRequestPack(void *obj, Packable *p); - static HttpRequest * FromUrl(char * url, const MasterXactionPointer &, const HttpRequestMethod &method = Http::METHOD_GET); + static HttpRequest * FromUrl(char * url, const MasterXaction::Pointer &, const HttpRequestMethod &method = Http::METHOD_GET); ConnStateData *pinnedConnection(); @@ -221,7 +221,7 @@ public: CbcPointer downloader; /// the master transaction this request belongs to. Never nil. - MasterXactionPointer masterXaction; + MasterXaction::Pointer masterXaction; /// forgets about the cached Range header (for a reason) void ignoreRange(const char *reason); diff --git a/src/Makefile.am b/src/Makefile.am index 68109c90dc..c93d6f4c28 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -272,7 +272,6 @@ squid_SOURCES = \ Debug.h \ defines.h \ $(DELAY_POOL_SOURCE) \ - forward.h \ fs_io.h \ fs_io.cc \ dlink.h \ diff --git a/src/client_side.h b/src/client_side.h index 8c774f2cbf..b5af75cb4d 100644 --- a/src/client_side.h +++ b/src/client_side.h @@ -14,7 +14,6 @@ #include "base/RunnersRegistry.h" #include "clientStreamForward.h" #include "comm.h" -#include "forward.h" #include "helper/forward.h" #include "http/forward.h" #include "HttpControlMsg.h" @@ -35,6 +34,9 @@ class ClientHttpRequest; class HttpHdrRangeSpec; +class MasterXaction; +typedef RefCount MasterXactionPointer; + #if USE_OPENSSL namespace Ssl { diff --git a/src/client_side_request.h b/src/client_side_request.h index 40c270c5b4..9950ef87ff 100644 --- a/src/client_side_request.h +++ b/src/client_side_request.h @@ -13,7 +13,6 @@ #include "acl/forward.h" #include "client_side.h" #include "clientStream.h" -#include "forward.h" #include "http/forward.h" #include "HttpHeaderRange.h" #include "LogTags.h" diff --git a/src/forward.h b/src/forward.h deleted file mode 100644 index 8b657678f8..0000000000 --- a/src/forward.h +++ /dev/null @@ -1,17 +0,0 @@ -/* - * Copyright (C) 1996-2017 The Squid Software Foundation and contributors - * - * Squid software is distributed under GPLv2+ license and includes - * contributions from numerous individuals and organizations. - * Please see the COPYING and CONTRIBUTORS files for details. - */ - -#ifndef SQUID_SRC_FORWARD_H -#define SQUID_SRC_FORWARD_H - -class MasterXaction; -template class RefCount; -typedef RefCount MasterXactionPointer; - -#endif - diff --git a/src/servers/Server.h b/src/servers/Server.h index 40d1ba3e79..8cb4fb13fc 100644 --- a/src/servers/Server.h +++ b/src/servers/Server.h @@ -17,9 +17,9 @@ #include "BodyPipe.h" #include "comm/Write.h" #include "CommCalls.h" -#include "forward.h" #include "Pipeline.h" #include "sbuf/SBuf.h" +#include "servers/forward.h" /** * Common base for all Server classes used diff --git a/src/tests/stub_HttpRequest.cc b/src/tests/stub_HttpRequest.cc index 620cb6f0eb..55de070fd3 100644 --- a/src/tests/stub_HttpRequest.cc +++ b/src/tests/stub_HttpRequest.cc @@ -9,15 +9,14 @@ #include "squid.h" #include "AccessLogEntry.h" #include "HttpRequest.h" -#include "MasterXaction.h" #define STUB_API "HttpRequest.cc" #include "tests/STUB.h" // void httpRequestPack(void *obj, Packable *p); -HttpRequest::HttpRequest(const MasterXactionPointer&) : Http::Message(hoRequest) {STUB} -HttpRequest::HttpRequest(const HttpRequestMethod &, AnyP::ProtocolType, const char *, const char *, const MasterXactionPointer &) : Http::Message(hoRequest) {STUB} +HttpRequest::HttpRequest(const MasterXaction::Pointer&) : Http::Message(hoRequest) {STUB} +HttpRequest::HttpRequest(const HttpRequestMethod &, AnyP::ProtocolType, const char *, const char *, const MasterXaction::Pointer &) : Http::Message(hoRequest) {STUB} HttpRequest::~HttpRequest() STUB void HttpRequest::reset() STUB void HttpRequest::initHTTP(const HttpRequestMethod &, AnyP::ProtocolType, const char *, const char *) STUB diff --git a/src/tests/testHttpRequest.cc b/src/tests/testHttpRequest.cc index 213df90c33..fa02079197 100644 --- a/src/tests/testHttpRequest.cc +++ b/src/tests/testHttpRequest.cc @@ -23,7 +23,7 @@ CPPUNIT_TEST_SUITE_REGISTRATION( testHttpRequest ); class PrivateHttpRequest : public HttpRequest { public: - PrivateHttpRequest(const MasterXactionPointer &mx) : HttpRequest(mx) {} + PrivateHttpRequest(const MasterXaction::Pointer &mx) : HttpRequest(mx) {} bool doSanityCheckStartLine(const char *b, const size_t h, Http::StatusCode *e) { return sanityCheckStartLine(b,h,e); }; };