From: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date: Thu, 11 Aug 2011 10:02:40 +0000 (+0100)
Subject: Don't build any of the reload-pipe code on non-Unix
X-Git-Tag: dbus-1.5.8~9^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2f183ac576c77fe50899db868e7c545ee31b510f;p=thirdparty%2Fdbus.git

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.

Reviewed-by: Will Thompson <will.thompson@collabora.co.uk>
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=40002
---

diff --git a/bus/main.c b/bus/main.c
index 47f38c8cb..bec2939ce 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. */