lib: #include "util_event.h" only where needed

One dependency of includes.h less

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
Autobuild-User(master): Jeremy Allison <jra@samba.org>
Autobuild-Date(master): Tue Apr 24 22:26:22 CEST 2018 on sn-devel-144

diff --git a/source3/include/includes.h b/source3/include/includes.h
index d822c3f9300022593a66c3a63b16819194480a96..9c47c342bba047edfcd8d60f0c89951460584532 100644 (file)
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -260,7 +260,6 @@ typedef char fstring[FSTRING_LEN];
 
 #include <talloc.h>
 #include <tevent.h>
-#include "util_event.h"
 
 #include "../lib/util/data_blob.h"
 #include "../lib/util/time.h"

diff --git a/source3/include/util_event.h b/source3/include/util_event.h
index f29bb0a9ed41078b92bb30717f4300a5bd5878d1..d19678e7359fa3bae82c8a63ca4ed153d2f09d29 100644 (file)
--- a/source3/include/util_event.h
+++ b/source3/include/util_event.h
@@ -19,6 +19,10 @@
 */
 
 /* The following definitions come from lib/util_event.c  */
+
+#include "replace.h"
+#include <tevent.h>
+
 struct idle_event;
 
 struct idle_event *event_add_idle(struct tevent_context *event_ctx,

diff --git a/source3/lib/util_event.c b/source3/lib/util_event.c
index 4ca2840b661b04299b1f1dc0eb9db778cc220c9f..ea7e7b749eab79041a3dd2b84001f7f6b84ee2e2 100644 (file)
--- a/source3/lib/util_event.c
+++ b/source3/lib/util_event.c
@@ -19,6 +19,7 @@
 */
 
 #include "includes.h"
+#include "util_event.h"
 
 struct idle_event {
        struct tevent_timer *te;

diff --git a/source3/printing/queue_process.c b/source3/printing/queue_process.c
index 24708c1953773e5d849ae0007dce0f35e0676ea2..c4941d84ccd7007590ab73de141df64b8ea14680 100644 (file)
--- a/source3/printing/queue_process.c
+++ b/source3/printing/queue_process.c
@@ -34,6 +34,7 @@
 #include "rpc_server/spoolss/srv_spoolss_nt.h"
 #include "auth.h"
 #include "nt_printing.h"
+#include "util_event.h"
 
 extern pid_t start_spoolssd(struct tevent_context *ev_ctx,
                            struct messaging_context *msg_ctx);

diff --git a/source3/smbd/process.c b/source3/smbd/process.c
index 516ac4cb2904dffcf30ac2fdb9ba58f14d365a1f..6a3395ceabf503e842e242f042e2195cf8ba54d1 100644 (file)
--- a/source3/smbd/process.c
+++ b/source3/smbd/process.c
@@ -43,6 +43,7 @@
 #include "lib/util/sys_rw_data.h"
 #include "system/threads.h"
 #include "lib/pthreadpool/pthreadpool_tevent.h"
+#include "util_event.h"
 
 /* Internal message queue for deferred opens. */
 struct pending_message_list {