From 21d926f0ef35eb3b34841d9d9606e8f819db9819 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Sun, 27 Feb 2011 18:39:10 +0100
Subject: [PATCH] Use <tevent.h> so the system tevent gets included, if
 enabled.

---
 lib/util/tevent_unix.h            | 2 +-
 lib/util/util_runcmd.c            | 4 ++--
 source4/lib/events/events.h       | 2 +-
 source4/ntvfs/sysdep/sys_notify.c | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib/util/tevent_unix.h b/lib/util/tevent_unix.h
index bc2cea91999..377e976c390 100644
--- 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 aa2a3e66727..50a3db7f728 100644
--- 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 5fdb96794e5..f66698838d7 100644
--- 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 72509e67a54..03679b644de 100644
--- 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"
 
-- 
2.11.4.GIT