Use <tevent.h> so the system tevent gets included, if enabled.

diff --git a/lib/util/tevent_unix.h b/lib/util/tevent_unix.h
index bc2cea9199913c013bc0531408de80fe530b4f8c..377e976c390930a4cd1d8b1cfcae6ab62d6a0798 100644 (file)
--- a/lib/util/tevent_unix.h
+++ b/lib/util/tevent_unix.h
@@ -24,7 +24,7 @@
 #ifndef _TEVENT_UNIX_H
 #define _TEVENT_UNIX_H
 
-#include "../tevent/tevent.h"
+#include <tevent.h>
 
 bool tevent_req_is_unix_error(struct tevent_req *req, int *perrno);
 

diff --git a/lib/util/util_runcmd.c b/lib/util/util_runcmd.c
index aa2a3e66727989e2d59227b51ad036243b81a82d..50a3db7f7281c334ff72101f6d55b4dd6cf57404 100644 (file)
--- a/lib/util/util_runcmd.c
+++ b/lib/util/util_runcmd.c
@@ -27,8 +27,8 @@
 
 #include "includes.h"
 #include "system/filesys.h"
-#include "lib/tevent/tevent.h"
-#include "lib/util/tevent_unix.h"
+#include <tevent.h>
+#include <tevent_unix.h>
 
 struct samba_runcmd_state {
        int stdout_log_level;

diff --git a/source4/lib/events/events.h b/source4/lib/events/events.h
index 5fdb96794e53b201edf999c69fa47fe0f3d57780..f66698838d726b442db4624513e5527433202881 100644 (file)
--- a/source4/lib/events/events.h
+++ b/source4/lib/events/events.h
@@ -1,7 +1,7 @@
 #ifndef __LIB_EVENTS_H__
 #define __LIB_EVENTS_H__
 #define TEVENT_COMPAT_DEFINES 1
-#include <../lib/tevent/tevent.h>
+#include <tevent.h>
 struct tevent_context *s4_event_context_init(TALLOC_CTX *mem_ctx);
 struct tevent_context *event_context_find(TALLOC_CTX *mem_ctx) _DEPRECATED_;
 void s4_event_context_set_default(struct tevent_context *ev);

diff --git a/source4/ntvfs/sysdep/sys_notify.c b/source4/ntvfs/sysdep/sys_notify.c
index 72509e67a54d7904247a67ebcae791f593188357..03679b644de48bcfc354ec45ffecf3cd6ad1bdc6 100644 (file)
--- a/source4/ntvfs/sysdep/sys_notify.c
+++ b/source4/ntvfs/sysdep/sys_notify.c
@@ -25,7 +25,7 @@
 #include "includes.h"
 #include "system/filesys.h"
 #include "ntvfs/sysdep/sys_notify.h"
-#include "../lib/tevent/tevent.h"
+#include <tevent.h>
 #include "../lib/util/dlinklist.h"
 #include "param/param.h"