Import CUPS v2.0rc1

[thirdparty/cups.git] / scheduler / listen.c

diff --git a/scheduler/listen.c b/scheduler/listen.c
index 842d3787718b31a52b26a7efdd8473321459e77f..a704121654b8930977e4689a460c240e5718006b 100644 (file)
--- a/scheduler/listen.c
+++ b/scheduler/listen.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: listen.c 11717 2014-03-21 16:42:53Z msweet $"
+ * "$Id: listen.c 12080 2014-08-04 13:23:50Z msweet $"
  *
  * Server listening routines for the CUPS scheduler.
  *
@@ -274,23 +274,14 @@ cupsdStopListening(void)
        lis;
        lis = (cupsd_listener_t *)cupsArrayNext(Listeners))
   {
-#ifdef HAVE_SYSTEMD
+#if defined(HAVE_LAUNCHD) || defined(HAVE_SYSTEMD)
     if (lis->fd != -1 && !lis->on_demand)
       httpAddrClose(&(lis->address), lis->fd);
 
-#elif defined(HAVE_LAUNCHD)
-    if (lis->fd != -1)
-    {
-      if (lis->on_demand)
-        httpAddrClose(NULL, lis->fd);
-      else
-        httpAddrClose(&(lis->address), lis->fd);
-    }
-
 #else
     if (lis->fd != -1)
       httpAddrClose(&(lis->address), lis->fd);
-#endif /* HAVE_SYSTEMD */
+#endif /* HAVE_LAUNCHD || HAVE_SYSTEMD */
 
     lis->fd = -1;
   }
@@ -298,5 +289,5 @@ cupsdStopListening(void)
 
 
 /*
- * End of "$Id: listen.c 11717 2014-03-21 16:42:53Z msweet $".
+ * End of "$Id: listen.c 12080 2014-08-04 13:23:50Z msweet $".
  */