From: Chengwei Yang <chengwei.yang@intel.com>
Date: Fri, 1 Nov 2013 08:23:27 +0000 (+0800)
Subject: Use SIGHUP without check in UNIX environment
X-Git-Tag: dbus-1.7.8~12
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=aa4b9d39bd04d18b57af9b247a326f6b7c328254;p=thirdparty%2Fdbus.git

Use SIGHUP without check in UNIX environment

As Simon's comment
  https://bugs.freedesktop.org/show_bug.cgi?id=66068#c8
we can do this in UNIX environment.

Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
---

diff --git a/bus/main.c b/bus/main.c
index 472458ed2..e060baa8e 100644
--- a/bus/main.c
+++ b/bus/main.c
@@ -61,7 +61,6 @@ signal_handler (int sig)
 {
   switch (sig)
     {
-#ifdef SIGHUP
     case SIGHUP:
       {
         DBusString str;
@@ -94,7 +93,6 @@ signal_handler (int sig)
           }
       }
       break;
-#endif
 
     case SIGTERM:
       {
@@ -642,9 +640,7 @@ main (int argc, char **argv)
    * no point in trying to make the handler portable to non-Unix. */
 
   _dbus_set_signal_handler (SIGTERM, signal_handler);
-#ifdef SIGHUP
   _dbus_set_signal_handler (SIGHUP, signal_handler);
-#endif
 #endif /* DBUS_UNIX */
 
   _dbus_verbose ("We are on D-Bus...\n");