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 3aec5fd9fde69130b2232b80a07298240f49304e..0d8b2ca8f241bc9545d4028ff7cc6a2c957665ea 100644 (file)
--- 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<HttpRequest> 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> 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 68109c90dcb8dfc67b4d357ea8d8c93734603699..c93d6f4c283fb045a9189f9bf281fb8e71bf07f3 100644 (file)
--- 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 8c774f2cbfaa10305f04b6e8d5264f91a5f84ba3..b5af75cb4da8f9fb47a81c7526bb5552cf0dab3f 100644 (file)
--- 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<MasterXaction> MasterXactionPointer;
+
 #if USE_OPENSSL
 namespace Ssl
 {

diff --git a/src/client_side_request.h b/src/client_side_request.h
index 40c270c5b49e36d6f792651150ec7f0fa6a46bf9..9950ef87ffe4bfbd9027d2b86ac1eee4d796b7e5 100644 (file)
--- 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 (file)
index 8b65767..0000000
--- 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 C> class RefCount;
-typedef RefCount<MasterXaction> MasterXactionPointer;
-
-#endif
-

diff --git a/src/servers/Server.h b/src/servers/Server.h
index 40d1ba3e790cb63c97082626ff105a81cc2e309e..8cb4fb13fc7711e6854cac0b49b1406b695531c2 100644 (file)
--- 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 620cb6f0ebdd3236fc648c889ca614f3083ee502..55de070fd36420876f81112a8e45b073f189b678 100644 (file)
--- 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 213df90c33855811c28953d980602dadb6effd27..fa02079197683f7573195c803e78af64a8643c5e 100644 (file)
--- 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); };
 };