[Fix] Do not be cheated by system hiredis

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"

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;
 

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