Avoid including events_util.h in events_internal.h since the latter is

installed.

diff --git a/source/lib/events/events.c b/source/lib/events/events.c
index 1c94e3436d7542785d88a9fe24bacef237c2ebfc..52699d968e72889d903d1a0b86ac77812b53e1f5 100644 (file)
--- a/source/lib/events/events.c
+++ b/source/lib/events/events.c
@@ -55,6 +55,7 @@
 #include "replace.h"
 #include "events.h"
 #include "events_internal.h"
+#include "events_util.h"
 
 struct event_ops_list {
        struct event_ops_list *next, *prev;

diff --git a/source/lib/events/events_epoll.c b/source/lib/events/events_epoll.c
index c781bd99aeb03f85b64f1683eb2011e066c63224..d46d5c2bbc5c7fdfe40fbdfab2b5a5e593f95fa8 100644 (file)
--- a/source/lib/events/events_epoll.c
+++ b/source/lib/events/events_epoll.c
@@ -25,6 +25,7 @@
 #include "system/network.h"
 #include "events.h"
 #include "events_internal.h"
+#include "events_util.h"
 #include <sys/epoll.h>
 
 struct epoll_event_context {

diff --git a/source/lib/events/events_internal.h b/source/lib/events/events_internal.h
index 78df98a1fe94bd7336212f5b1bdd3257a7f56125..0d0755f2985b3e3a7a3ee6a33ab44fd774729740 100644 (file)
--- a/source/lib/events/events_internal.h
+++ b/source/lib/events/events_internal.h
@@ -156,5 +156,3 @@ bool events_epoll_init(void);
 #if HAVE_LINUX_AIO
 bool events_aio_init(void);
 #endif
-
-#include "events_util.h"

diff --git a/source/lib/events/events_select.c b/source/lib/events/events_select.c
index 9e97d2b39f2e002ddac035acba2c94df876bb493..54d32204f56692985ed0e7a52c2bb767fe454ed0 100644 (file)
--- a/source/lib/events/events_select.c
+++ b/source/lib/events/events_select.c
@@ -27,6 +27,7 @@
 #include "system/filesys.h"
 #include "system/select.h"
 #include "events.h"
+#include "events_util.h"
 #include "events_internal.h"
 
 struct select_event_context {

diff --git a/source/lib/events/events_signal.c b/source/lib/events/events_signal.c
index 5c74c47eddc649c38aa37b084ea8be9aa70800f4..80a14acc117eff19d8a30309be8059994ff7b342 100644 (file)
--- a/source/lib/events/events_signal.c
+++ b/source/lib/events/events_signal.c
@@ -25,6 +25,7 @@
 #include "system/select.h"
 #include "events.h"
 #include "events_internal.h"
+#include "events_util.h"
 
 #define NUM_SIGNALS 64
 

diff --git a/source/lib/events/events_standard.c b/source/lib/events/events_standard.c
index fbf83897c84c5ac0b112da7afd4c2b58328daa0f..11128d7623d23c3862ea133c042896297de8dd09 100644 (file)
--- a/source/lib/events/events_standard.c
+++ b/source/lib/events/events_standard.c
@@ -32,6 +32,7 @@
 #include "system/network.h"
 #include "system/select.h" /* needed for HAVE_EVENTS_EPOLL */
 #include "events.h"
+#include "events_util.h"
 #include "events_internal.h"
 
 struct std_event_context {

diff --git a/source/lib/events/events_timed.c b/source/lib/events/events_timed.c
index c81825bf92dc4286b6bc2b17379004387ed29a1f..c58c898c6db9b986c7d42730351b6f01d77446f7 100644 (file)
--- a/source/lib/events/events_timed.c
+++ b/source/lib/events/events_timed.c
@@ -27,6 +27,7 @@
 #include "system/select.h"
 #include "events.h"
 #include "events_internal.h"
+#include "events_util.h"
 
 /**
   compare two timeval structures.