aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVsevolod Stakhov <vsevolod@rspamd.com>2022-10-16 15:25:04 +0100
committerVsevolod Stakhov <vsevolod@rspamd.com>2022-10-16 15:25:04 +0100
commitde1cf75eecf2bdc4f02737a5b59b791baf55213a (patch)
tree5fa218afeb03da65799d2af3518e13df5d9149d9
parent49b60a37470e59aeadc7c25a966a656d054a2bc2 (diff)
downloadrspamd-de1cf75eecf2bdc4f02737a5b59b791baf55213a.tar.gz
rspamd-de1cf75eecf2bdc4f02737a5b59b791baf55213a.zip
[Minor] Move hyperscan tools to the libserver domain
-rw-r--r--src/libserver/CMakeLists.txt1
-rw-r--r--src/libserver/hyperscan_tools.cxx (renamed from src/libutil/cxx/hyperscan_tools.cxx)3
-rw-r--r--src/libutil/CMakeLists.txt3
3 files changed, 3 insertions, 4 deletions
diff --git a/src/libserver/CMakeLists.txt b/src/libserver/CMakeLists.txt
index d287f44c1..c4940f917 100644
--- a/src/libserver/CMakeLists.txt
+++ b/src/libserver/CMakeLists.txt
@@ -42,6 +42,7 @@ SET(LIBRSPAMDSERVERSRC
${CMAKE_CURRENT_SOURCE_DIR}/html/html_url.cxx
${CMAKE_CURRENT_SOURCE_DIR}/html/html.cxx
${CMAKE_CURRENT_SOURCE_DIR}/html/html_tests.cxx
+ ${CMAKE_CURRENT_SOURCE_DIR}/hyperscan_tools.cxx
${LIBCSSSRC})
# Librspamd-server
diff --git a/src/libutil/cxx/hyperscan_tools.cxx b/src/libserver/hyperscan_tools.cxx
index f5086d1e4..3dedad52d 100644
--- a/src/libutil/cxx/hyperscan_tools.cxx
+++ b/src/libserver/hyperscan_tools.cxx
@@ -20,10 +20,9 @@
#include "contrib/ankerl/unordered_dense.h"
#include "contrib/ankerl/svector.h"
#include "fmt/core.h"
-#include "locked_file.hxx"
+#include "libutil/cxx/locked_file.hxx"
#include "hs.h"
#include "logger.h"
-#include "locked_file.hxx"
#include <glob.h> /* for glob */
#include <unistd.h> /* for unlink */
diff --git a/src/libutil/CMakeLists.txt b/src/libutil/CMakeLists.txt
index 8602baf6e..7b3103720 100644
--- a/src/libutil/CMakeLists.txt
+++ b/src/libutil/CMakeLists.txt
@@ -18,7 +18,6 @@ SET(LIBRSPAMDUTILSRC
${CMAKE_CURRENT_SOURCE_DIR}/heap.c
${CMAKE_CURRENT_SOURCE_DIR}/multipattern.c
${CMAKE_CURRENT_SOURCE_DIR}/cxx/utf8_util.cxx
- ${CMAKE_CURRENT_SOURCE_DIR}/cxx/locked_file.cxx
- ${CMAKE_CURRENT_SOURCE_DIR}/cxx/hyperscan_tools.cxx)
+ ${CMAKE_CURRENT_SOURCE_DIR}/cxx/locked_file.cxx)
# Rspamdutil
SET(RSPAMD_UTIL ${LIBRSPAMDUTILSRC} PARENT_SCOPE) \ No newline at end of file