diff --git a/src/AsyncEngine.cc b/src/AsyncEngine.cc deleted file mode 100644 index 2b934472e35..00000000000 --- a/src/AsyncEngine.cc +++ /dev/null @@ -1,11 +0,0 @@ -/* - * Copyright (C) 1996-2023 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. - */ - -#include "squid.h" -#include "AsyncEngine.h" - diff --git a/src/EventLoop.cc b/src/EventLoop.cc index 00920c732dd..b744e170a83 100644 --- a/src/EventLoop.cc +++ b/src/EventLoop.cc @@ -9,8 +9,8 @@ /* DEBUG: section 01 Main Loop */ #include "squid.h" -#include "AsyncEngine.h" #include "base/AsyncCallQueue.h" +#include "base/AsyncEngine.h" #include "debug/Stream.h" #include "EventLoop.h" #include "fatal.h" diff --git a/src/Makefile.am b/src/Makefile.am index 8058f776085..8f7026a60b6 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -195,8 +195,6 @@ squid_SOURCES = \ $(WINSVC_SOURCE) \ AccessLogEntry.cc \ AccessLogEntry.h \ - AsyncEngine.cc \ - AsyncEngine.h \ AuthReg.h \ BodyPipe.cc \ BodyPipe.h \ diff --git a/src/adaptation/ecap/ServiceRep.cc b/src/adaptation/ecap/ServiceRep.cc index dac4a1f92d7..b6a8a456ac5 100644 --- a/src/adaptation/ecap/ServiceRep.cc +++ b/src/adaptation/ecap/ServiceRep.cc @@ -13,7 +13,7 @@ #include "adaptation/ecap/Host.h" #include "adaptation/ecap/ServiceRep.h" #include "adaptation/ecap/XactionRep.h" -#include "AsyncEngine.h" +#include "base/AsyncEngine.h" #include "base/TextException.h" #include "debug/Stream.h" #include "EventLoop.h" diff --git a/src/AsyncEngine.h b/src/base/AsyncEngine.h similarity index 100% rename from src/AsyncEngine.h rename to src/base/AsyncEngine.h diff --git a/src/base/Makefile.am b/src/base/Makefile.am index ba18de1f8cc..249904f126a 100644 --- a/src/base/Makefile.am +++ b/src/base/Makefile.am @@ -20,6 +20,7 @@ libbase_la_SOURCES = \ AsyncCallQueue.h \ AsyncCallbacks.h \ AsyncCbdataCalls.h \ + AsyncEngine.h \ AsyncFunCalls.h \ AsyncJob.cc \ AsyncJob.h \ diff --git a/src/event.h b/src/event.h index d93e5fbee15..edee17e6cb5 100644 --- a/src/event.h +++ b/src/event.h @@ -9,7 +9,7 @@ #ifndef SQUID_EVENT_H #define SQUID_EVENT_H -#include "AsyncEngine.h" +#include "base/AsyncEngine.h" #include "base/Packable.h" #include "mem/forward.h" diff --git a/src/tests/testEventLoop.cc b/src/tests/testEventLoop.cc index 65ea78f9e91..ac97f0e617c 100644 --- a/src/tests/testEventLoop.cc +++ b/src/tests/testEventLoop.cc @@ -7,7 +7,7 @@ */ #include "squid.h" -#include "AsyncEngine.h" +#include "base/AsyncEngine.h" #include "compat/cppunit.h" #include "EventLoop.h" #include "time/Engine.h"