[Minor] change headers for zstd depending on bundled or system used

follow on patch from #3764

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a110f14f7ccbff3ffc0305b972f050e6b0159ea2..b46de3f4daf4109dcd94d1480ebe812469b66a6a 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -633,6 +633,7 @@ IF(SYSTEM_ZSTD MATCHES "OFF")
 ELSE()
        ProcessPackage(LIBZSTD LIBRARY zstd INCLUDE zstd.h
                ROOT ${LIBZSTD_ROOT_DIR} MODULES zstd)
+       ADD_DEFINITIONS(-DSYS_ZSTD)
 ENDIF()
 IF(ENABLE_SNOWBALL MATCHES "ON")
        ADD_SUBDIRECTORY(contrib/snowball)

diff --git a/src/client/rspamdclient.c b/src/client/rspamdclient.c
index 9a2e7f88d71b6f6ba406f0b5aa23f6b373ed3dec..f9f337864abbbf9983c21bd893c2535653b3bd50 100644 (file)
--- a/src/client/rspamdclient.c
+++ b/src/client/rspamdclient.c
@@ -19,7 +19,12 @@
 #include "libserver/http/http_private.h"
 #include "libserver/protocol_internal.h"
 #include "unix-std.h"
-#include "contrib/zstd/zstd.h"
+
+#ifdef SYS_ZSTD
+#  include "zstd.h"
+#else
+#  include "contrib/zstd/zstd.h"
+#endif
 
 #ifdef HAVE_FETCH_H
 #include <fetch.h>

diff --git a/src/libserver/cfg_utils.c b/src/libserver/cfg_utils.c
index 98e409d0ff8c8a7112d8bbe6350d8acb77e3fd7c..d846153b85ab990c48e796d2fc5c2ce5e3a97628 100644 (file)
--- a/src/libserver/cfg_utils.c
+++ b/src/libserver/cfg_utils.c
@@ -36,8 +36,12 @@
 #include "contrib/libottery/ottery.h"
 #include "contrib/fastutf8/fastutf8.h"
 
-#define ZSTD_STATIC_LINKING_ONLY
-#include "contrib/zstd/zstd.h"
+#ifdef SYS_ZSTD
+#  include "zstd.h"
+#else
+#  define ZSTD_STATIC_LINKING_ONLY
+#  include "contrib/zstd/zstd.h"
+#endif
 
 #ifdef HAVE_OPENSSL
 #include <openssl/rand.h>

diff --git a/src/libserver/maps/map.c b/src/libserver/maps/map.c
index bc53ca538cf7858d0bcc886aeab39299bd3f50f4..f324f9d702511406818790aa21a6efe577b472df 100644 (file)
--- a/src/libserver/maps/map.c
+++ b/src/libserver/maps/map.c
@@ -23,10 +23,15 @@
 #include "libserver/http/http_connection.h"
 #include "libserver/http/http_private.h"
 #include "rspamd.h"
-#include "contrib/zstd/zstd.h"
 #include "contrib/libev/ev.h"
 #include "contrib/uthash/utlist.h"
 
+#ifdef SYS_ZSTD
+#  include "zstd.h"
+#else
+#  include "contrib/zstd/zstd.h"
+#endif
+
 #undef MAP_DEBUG_REFS
 #ifdef MAP_DEBUG_REFS
 #define MAP_RETAIN(x, t) do { \

diff --git a/src/libserver/protocol.c b/src/libserver/protocol.c
index e7f4dbd508c80eff756df61d761fad9dc9e4850e..6e97068a645200cedd259af533fa737c8999c7fc 100644 (file)
--- a/src/libserver/protocol.c
+++ b/src/libserver/protocol.c
@@ -21,7 +21,6 @@
 #include "worker_private.h"
 #include "libserver/cfg_file_private.h"
 #include "libmime/scan_result_private.h"
-#include "contrib/zstd/zstd.h"
 #include "lua/lua_common.h"
 #include "unix-std.h"
 #include "protocol_internal.h"
@@ -30,6 +29,12 @@
 #include "task.h"
 #include <math.h>
 
+#ifdef SYS_ZSTD
+#  include "zstd.h"
+#else
+#  include "contrib/zstd/zstd.h"
+#endif
+
 INIT_LOG_MODULE(protocol)
 
 #define msg_err_protocol(...) rspamd_default_log_function (G_LOG_LEVEL_CRITICAL, \

diff --git a/src/libserver/task.c b/src/libserver/task.c
index 407f2c4d47feb78aed00bdc4515b1a06a21b862a..aae374c2130b6036b325b044f3572a799df648b0 100644 (file)
--- a/src/libserver/task.c
+++ b/src/libserver/task.c
@@ -25,7 +25,6 @@
 #include "stat_api.h"
 #include "unix-std.h"
 #include "utlist.h"
-#include "contrib/zstd/zstd.h"
 #include "libserver/mempool_vars_internal.h"
 #include "libserver/cfg_file_private.h"
 #include "libmime/lang_detection.h"
@@ -41,6 +40,12 @@
 
 #include <math.h>
 
+#ifdef SYS_ZSTD
+#  include "zstd.h"
+#else
+#  include "contrib/zstd/zstd.h"
+#endif
+
 __KHASH_IMPL (rspamd_req_headers_hash, static inline,
                rspamd_ftok_t *, struct rspamd_request_header_chain *, 1,
                                rspamd_ftok_icase_hash, rspamd_ftok_icase_equal)
@@ -1981,4 +1986,4 @@ rspamd_worker_guard_handler (EV_P_ ev_io *w, int revents)
                        return;
                }
        }
-}
\ No newline at end of file
+}

diff --git a/src/lua/lua_compress.c b/src/lua/lua_compress.c
index 5bebd0e0d95845674b102d0b364cec338f441592..599a796e0fdb8df045a4dff2f58e5f26fdbbdd92 100644 (file)
--- a/src/lua/lua_compress.c
+++ b/src/lua/lua_compress.c
@@ -16,10 +16,16 @@
 
 #include "lua_common.h"
 #include "unix-std.h"
-#include "contrib/zstd/zstd.h"
-#include "contrib/zstd/error_public.h"
 #include <zlib.h>
 
+#ifdef SYS_ZSTD
+#  include "zstd.h"
+#  include "zstd_errors.h"
+#else
+#  include "contrib/zstd/zstd.h"
+#  include "contrib/zstd/error_public.h"
+#endif
+
 /***
  * @module rspamd_compress
  * This module contains compression/decompression routines (zstd and zlib currently)
@@ -614,4 +620,4 @@ luaopen_compress (lua_State *L)
        lua_pop (L, 2);
 
        rspamd_lua_add_preload (L, "rspamd_zstd", lua_load_zstd);
-}
\ No newline at end of file
+}

diff --git a/src/rspamd_proxy.c b/src/rspamd_proxy.c
index f5bc5f68e2519e44a8275d1f0dfe5f01e695d486..267760c03af2ecbc46e556f9323945aefe73575d 100644 (file)
--- a/src/rspamd_proxy.c
+++ b/src/rspamd_proxy.c
@@ -36,7 +36,6 @@
 #include "libserver/milter.h"
 #include "libserver/milter_internal.h"
 #include "libmime/lang_detection.h"
-#include "contrib/zstd/zstd.h"
 
 #include <math.h>
 
@@ -44,6 +43,12 @@
 #include <netinet/tcp.h> /* for TCP_NODELAY */
 #endif
 
+#ifdef SYS_ZSTD
+#  include "zstd.h"
+#else
+#  include "contrib/zstd/zstd.h"
+#endif
+
 /* Rotate keys each minute by default */
 #define DEFAULT_ROTATION_TIME 60.0
 #define DEFAULT_RETRIES 5