From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Fri, 21 Jun 2019 10:48:42 +0000 (+0100)
Subject: [Minor] Fix include paths
X-Git-Tag: 2.0~755^2~14
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=516cc495ba4c952efb2bdef22c09c1aa74ccb46a;p=thirdparty%2Frspamd.git

[Minor] Fix include paths
---

diff --git a/contrib/hiredis/adapters/libev.h b/contrib/hiredis/adapters/libev.h
index 2bf8d521fc..9cf00dfd9b 100644
--- a/contrib/hiredis/adapters/libev.h
+++ b/contrib/hiredis/adapters/libev.h
@@ -32,7 +32,7 @@
 #define __HIREDIS_LIBEV_H__
 #include <stdlib.h>
 #include <sys/types.h>
-#include <ev.h>
+#include "contrib/libev/ev.h"
 #include "../hiredis.h"
 #include "../async.h"
 
diff --git a/contrib/librdns/rdns_ev.h b/contrib/librdns/rdns_ev.h
index 1b3554bc1b..aad34abda1 100644
--- a/contrib/librdns/rdns_ev.h
+++ b/contrib/librdns/rdns_ev.h
@@ -25,7 +25,7 @@
 #ifndef RDNS_EV_H_
 #define RDNS_EV_H_
 
-#include <ev.h>
+#include "contrib/libev/ev.h"
 #include <stdlib.h>
 #include <string.h>
 #include "rdns.h"
diff --git a/src/libserver/worker_util.c b/src/libserver/worker_util.c
index bb15d0407a..4072b95987 100644
--- a/src/libserver/worker_util.c
+++ b/src/libserver/worker_util.c
@@ -55,10 +55,10 @@
 #include <ucontext.h>
 #elif defined(HAVE_SYS_UCONTEXT_H)
 #include <sys/ucontext.h>
-#include <ev.h>
-
 #endif
 
+#include "contrib/libev/ev.h"
+
 static void rspamd_worker_ignore_signal (struct rspamd_worker_signal_handler *);
 /**
  * Return worker's control structure by its type
diff --git a/src/libutil/map.c b/src/libutil/map.c
index a68f212c27..9f43fa253f 100644
--- a/src/libutil/map.c
+++ b/src/libutil/map.c
@@ -16,7 +16,6 @@
 /*
  * Implementation of map files handling
  */
-#include <ev.h>
 #include "config.h"
 #include "map.h"
 #include "map_private.h"
@@ -24,6 +23,7 @@
 #include "http_private.h"
 #include "rspamd.h"
 #include "contrib/zstd/zstd.h"
+#include "contrib/libev/ev.h"
 
 #undef MAP_DEBUG_REFS
 #ifdef MAP_DEBUG_REFS
diff --git a/src/rspamd.c b/src/rspamd.c
index fa6bd55b3c..fb87df06f5 100644
--- a/src/rspamd.c
+++ b/src/rspamd.c
@@ -59,11 +59,11 @@
 #ifdef HAVE_OPENSSL
 #include <openssl/err.h>
 #include <openssl/evp.h>
-#include <ev.h>
 
 #endif
 
 #include "sqlite3.h"
+#include "contrib/libev/ev.h"
 
 /* 2 seconds to fork new process in place of dead one */
 #define SOFT_FORK_TIME 2