From fddfea8b7b7fa2647f7c94df09e613aa4dd469f7 Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Thu, 11 Aug 2011 11:02:40 +0100 Subject: [PATCH] Don't build any of the reload-pipe code on non-Unix In commit ab7b3f9, Ralf notes that handle_reload_watch() is (in principle) cross-platform. However, there's no way to trigger it on Windows, because nothing ever writes to the pipe. Make the entire pipe-to-self trick Unix-specific instead. --- bus/main.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/bus/main.c b/bus/main.c index 47f38c8..bec2939 100644 --- a/bus/main.c +++ b/bus/main.c @@ -42,6 +42,8 @@ static BusContext *context; +#ifdef DBUS_UNIX + static int reload_pipe[2]; #define RELOAD_READ_END 0 #define RELOAD_WRITE_END 1 @@ -54,7 +56,6 @@ typedef enum ACTION_QUIT = 'q' } SignalAction; -#ifdef DBUS_UNIX static void signal_handler (int sig) { @@ -212,6 +213,7 @@ check_two_pid_descriptors (const DBusString *pid_fd, } } +#ifdef DBUS_UNIX static dbus_bool_t handle_reload_watch (DBusWatch *watch, unsigned int flags, @@ -341,6 +343,7 @@ close_reload_pipe (void) _dbus_close_socket (reload_pipe[RELOAD_WRITE_END], NULL); reload_pipe[RELOAD_WRITE_END] = -1; } +#endif /* DBUS_UNIX */ int main (int argc, char **argv) @@ -591,9 +594,9 @@ main (int argc, char **argv) * print_pid_pipe */ +#ifdef DBUS_UNIX setup_reload_pipe (bus_context_get_loop (context)); -#ifdef DBUS_UNIX /* POSIX signals are Unix-specific, and _dbus_set_signal_handler is * unimplemented (and probably unimplementable) on Windows, so there's * no point in trying to make the handler portable to non-Unix. */ -- 1.7.5.4