5 files changed, 8 insertions, 8 deletions
diff --git a/source4/ntvfs/sysdep/inotify.c b/source4/ntvfs/sysdep/inotify.c
index c47a1216c8..f7aa91dd0e 100644
--- a/source4/ntvfs/sysdep/inotify.c
+++ b/source4/ntvfs/sysdep/inotify.c
@@ -198,7 +198,7 @@ static void inotify_dispatch(struct inotify_private *in,
 /*
   called when the kernel has some events for us
 */
-static void inotify_handler(struct event_context *ev, struct fd_event *fde,
+static void inotify_handler(struct tevent_context *ev, struct tevent_fd *fde,
 			    uint16_t flags, void *private_data)
 {
 	struct inotify_private *in = talloc_get_type(private_data,
diff --git a/source4/ntvfs/sysdep/sys_lease.c b/source4/ntvfs/sysdep/sys_lease.c
index 64e993f395..12fd83e8e0 100644
--- a/source4/ntvfs/sysdep/sys_lease.c
+++ b/source4/ntvfs/sysdep/sys_lease.c
@@ -39,7 +39,7 @@ static uint32_t num_backends;
 */
 _PUBLIC_ struct sys_lease_context *sys_lease_context_create(struct share_config *scfg,
 							    TALLOC_CTX *mem_ctx,
-							    struct event_context *ev,
+							    struct tevent_context *ev,
 							    struct messaging_context *msg,
 							    sys_lease_send_break_fn break_send)
 {
diff --git a/source4/ntvfs/sysdep/sys_lease.h b/source4/ntvfs/sysdep/sys_lease.h
index 6cda6398b2..422797b0b8 100644
--- a/source4/ntvfs/sysdep/sys_lease.h
+++ b/source4/ntvfs/sysdep/sys_lease.h
@@ -22,7 +22,7 @@
 struct sys_lease_context;
 struct opendb_entry;
 struct messaging_context;
-struct event_context;
+struct tevent_context;
 
 typedef NTSTATUS (*sys_lease_send_break_fn)(struct messaging_context *,
 					    struct opendb_entry *,
@@ -40,7 +40,7 @@ struct sys_lease_ops {
 };
 
 struct sys_lease_context {
-	struct event_context *event_ctx;
+	struct tevent_context *event_ctx;
 	struct messaging_context *msg_ctx;
 	sys_lease_send_break_fn break_send;
 	void *private_data; /* for use of backend */
@@ -52,7 +52,7 @@ NTSTATUS sys_lease_init(void);
 
 struct sys_lease_context *sys_lease_context_create(struct share_config *scfg,
 						   TALLOC_CTX *mem_ctx,
-						   struct event_context *ev,
+						   struct tevent_context *ev,
 						   struct messaging_context *msg_ctx,
 						   sys_lease_send_break_fn break_send);
 
diff --git a/source4/ntvfs/sysdep/sys_notify.c b/source4/ntvfs/sysdep/sys_notify.c
index 117d16d20a..57e921b206 100644
--- a/source4/ntvfs/sysdep/sys_notify.c
+++ b/source4/ntvfs/sysdep/sys_notify.c
@@ -40,7 +40,7 @@ static uint32_t num_backends;
 */
 _PUBLIC_ struct sys_notify_context *sys_notify_context_create(struct share_config *scfg,
 							      TALLOC_CTX *mem_ctx, 
-							      struct event_context *ev)
+							      struct tevent_context *ev)
 {
 	struct sys_notify_context *ctx;
 	const char *bname;
diff --git a/source4/ntvfs/sysdep/sys_notify.h b/source4/ntvfs/sysdep/sys_notify.h
index 63d4282e7c..d912a9bdaf 100644
--- a/source4/ntvfs/sysdep/sys_notify.h
+++ b/source4/ntvfs/sysdep/sys_notify.h
@@ -32,7 +32,7 @@ typedef NTSTATUS (*notify_watch_t)(struct sys_notify_context *ctx,
 				   void *handle_p);
 
 struct sys_notify_context {
-	struct event_context *ev;
+	struct tevent_context *ev;
 	void *private_data; /* for use of backend */
 	const char *name;
 	notify_watch_t notify_watch;
@@ -46,7 +46,7 @@ struct sys_notify_backend {
 NTSTATUS sys_notify_register(struct sys_notify_backend *backend);
 struct sys_notify_context *sys_notify_context_create(struct share_config *scfg,
 						     TALLOC_CTX *mem_ctx, 
-						     struct event_context *ev);
+						     struct tevent_context *ev);
 NTSTATUS sys_notify_watch(struct sys_notify_context *ctx, struct notify_entry *e,
 			  sys_notify_callback_t callback, void *private_data, 
 			  void *handle);