[Fix] Do not be cheated by system hiredis

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e0be84d60e9440236e1a01cbcdc74cbb039bd461..f0749f806154036b0aadcf1c0e3e31673c45f352 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -476,7 +476,8 @@ ENDMACRO()
 # Initial set
 
 # Prefer local include dirs to system ones
-INCLUDE_DIRECTORIES("${CMAKE_SOURCE_DIR}/src"
+INCLUDE_DIRECTORIES("${CMAKE_SOURCE_DIR}/"
+               "${CMAKE_SOURCE_DIR}/src"
                "${CMAKE_SOURCE_DIR}/src/libutil"
                "${CMAKE_SOURCE_DIR}/src/libserver"
                "${CMAKE_SOURCE_DIR}/src/libmime"

diff --git a/src/libserver/redis_pool.c b/src/libserver/redis_pool.c
index 8ef0f9ad58921c242be2fbc65b281d0124076b23..aeb8dbeae6145fa4bead5e6db17e3a1ff7e61c11 100644 (file)
--- a/src/libserver/redis_pool.c
+++ b/src/libserver/redis_pool.c
@@ -18,11 +18,12 @@
 #include <event.h>
 #include "redis_pool.h"
 #include "cfg_file.h"
-#include "hiredis/hiredis.h"
-#include "hiredis/async.h"
-#include "hiredis/adapters/libevent.h"
+#include "contrib/hiredis/hiredis.h"
+#include "contrib/hiredis/async.h"
+#include "contrib/hiredis/adapters/libevent.h"
 #include "cryptobox.h"
 #include "ref.h"
+#include "logger.h"
 
 struct rspamd_redis_pool_elt;
 

diff --git a/src/lua/lua_redis.c b/src/lua/lua_redis.c
index b7fb8f6c400c5d47730278ad330a87d4dfc79fb5..815192d27c3fb71356fe7be85e4af4adeb9097f8 100644 (file)
--- a/src/lua/lua_redis.c
+++ b/src/lua/lua_redis.c
@@ -17,8 +17,8 @@
 #include "dns.h"
 #include "utlist.h"
 
-#include "hiredis/hiredis.h"
-#include "hiredis/async.h"
+#include "contrib/hiredis/hiredis.h"
+#include "contrib/hiredis/async.h"
 
 #define REDIS_DEFAULT_TIMEOUT 1.0