* bus/dir-watch-default.c, bus/dir-watch-dnotify.c,

  bus/dir-watch-kqueue.c (bus_watch_directory): Pass in a BusContext
  instead of a void *.  kqueue uses this to get the context's loop
  while the other modules ignore the parameter.  This allows us to
  avoid platform conditionals

* bus/bus.c (process_config_postinit): Pass in the context to the
  watch

1 files changed, 3 insertions, 1 deletions

diff --git a/bus/dir-watch.h b/bus/dir-watch.h
index 3b754261..263ee035 100644
--- a/bus/dir-watch.h
+++ b/bus/dir-watch.h
@@ -21,11 +21,13 @@
  *
  */
 
+#include "bus.h"
+
 #ifndef DIR_WATCH_H
 #define DIR_WATCH_H
 
 /* setup a watch on a directory (OS dependent, may be a NOP) */
-void bus_watch_directory (const char *directory, void *userdata);
+void bus_watch_directory (const char *directory, BusContext *context);
 
 /* drop all the watches previously set up by bus_config_watch_directory (OS dependent, may be a NOP) */
 void bus_drop_all_directory_watches (void);