From c13e478ab82cf7f728bc470783cd29a9029e6134 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Tue, 17 Jun 2008 02:21:46 +0200
Subject: Avoid including events_util.h in events_internal.h since the latter
 is installed. (This used to be commit
 7a7e8f30dd3e5bfad788a098872afa8263321cbb)

---
 source4/lib/events/events.c          | 1 +
 source4/lib/events/events_epoll.c    | 1 +
 source4/lib/events/events_internal.h | 2 --
 source4/lib/events/events_select.c   | 1 +
 source4/lib/events/events_signal.c   | 1 +
 source4/lib/events/events_standard.c | 1 +
 source4/lib/events/events_timed.c    | 1 +
 7 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/source4/lib/events/events.c b/source4/lib/events/events.c
index 1c94e3436d..52699d968e 100644
--- a/source4/lib/events/events.c
+++ b/source4/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/source4/lib/events/events_epoll.c b/source4/lib/events/events_epoll.c
index c781bd99ae..d46d5c2bbc 100644
--- a/source4/lib/events/events_epoll.c
+++ b/source4/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/source4/lib/events/events_internal.h b/source4/lib/events/events_internal.h
index 78df98a1fe..0d0755f298 100644
--- a/source4/lib/events/events_internal.h
+++ b/source4/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/source4/lib/events/events_select.c b/source4/lib/events/events_select.c
index 9e97d2b39f..54d32204f5 100644
--- a/source4/lib/events/events_select.c
+++ b/source4/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/source4/lib/events/events_signal.c b/source4/lib/events/events_signal.c
index 5c74c47edd..80a14acc11 100644
--- a/source4/lib/events/events_signal.c
+++ b/source4/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/source4/lib/events/events_standard.c b/source4/lib/events/events_standard.c
index fbf83897c8..11128d7623 100644
--- a/source4/lib/events/events_standard.c
+++ b/source4/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/source4/lib/events/events_timed.c b/source4/lib/events/events_timed.c
index c81825bf92..c58c898c6d 100644
--- a/source4/lib/events/events_timed.c
+++ b/source4/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. 
-- 
cgit