commit 516cc49: [Minor] Fix include paths
Vsevolod Stakhov
vsevolod at highsecure.ru
Sat Jun 22 12:14:45 UTC 2019
Author: Vsevolod Stakhov
Date: 2019-06-21 11:48:42 +0100
URL: https://github.com/rspamd/rspamd/commit/516cc495ba4c952efb2bdef22c09c1aa74ccb46a
[Minor] Fix include paths
---
contrib/hiredis/adapters/libev.h | 2 +-
contrib/librdns/rdns_ev.h | 2 +-
src/libserver/worker_util.c | 4 ++--
src/libutil/map.c | 2 +-
src/rspamd.c | 2 +-
5 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/contrib/hiredis/adapters/libev.h b/contrib/hiredis/adapters/libev.h
index 2bf8d521f..9cf00dfd9 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 1b3554bc1..aad34abda 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 bb15d0407..4072b9598 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 a68f212c2..9f43fa253 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 fa6bd55b3..fb87df06f 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
More information about the Commits
mailing list