diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2011-08-26 15:07:41 +0100 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2011-08-26 15:07:41 +0100 |
| commit | 775f77c719de325a0cbf8fb1d56ebbb8f6a923d7 (patch) | |
| tree | 27db7105afa1f5f7c020bc34e6e1c108c813c58a /bus/main.c | |
| parent | 2eddc3265c31f31349bc06af396393dbd6cbe8eb (diff) | |
| parent | 2f183ac576c77fe50899db868e7c545ee31b510f (diff) | |
| download | dbus-775f77c719de325a0cbf8fb1d56ebbb8f6a923d7.tar.gz | |
Merge branch 'dbus-1.4'
Diffstat (limited to 'bus/main.c')
| -rw-r--r-- | bus/main.c | 7 |
1 files changed, 5 insertions, 2 deletions
@@ -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, @@ -337,6 +339,7 @@ close_reload_pipe (DBusWatch **watch) _dbus_close_socket (reload_pipe[RELOAD_WRITE_END], NULL); reload_pipe[RELOAD_WRITE_END] = -1; } +#endif /* DBUS_UNIX */ int main (int argc, char **argv) @@ -585,9 +588,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. */ |