summaryrefslogtreecommitdiff
path: root/scheduler/client.h
diff options
context:
space:
mode:
authorBrian Norris <briannorris@google.com>2016-05-27 13:06:58 -0700
committerBrian Norris <briannorris@google.com>2016-05-27 13:06:58 -0700
commitc187d9abe735d867f1dc47db5646495250394bc9 (patch)
tree0703c6a65edc316ecb72f2f272e99669625876ae /scheduler/client.h
parent11b24fee62ec989f3781ce3783a15690a14e4715 (diff)
downloadcups-c187d9abe735d867f1dc47db5646495250394bc9.tar.gz
Factor out generic 'HAVE_ONDEMAND' macro flag
HAVE_SYSTEMD and HAVE_LAUNCHD use very similar code for on-demand launching of cupsd, and if we want to add one more (e.g., upstart) it's easier to just use a single common flag: HAVE_ONDEMAND.
Diffstat (limited to 'scheduler/client.h')
-rw-r--r--scheduler/client.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/scheduler/client.h b/scheduler/client.h
index a7811fa78..174b7271e 100644
--- a/scheduler/client.h
+++ b/scheduler/client.h
@@ -79,9 +79,9 @@ typedef struct
int fd; /* File descriptor for this server */
http_addr_t address; /* Bind address of socket */
http_encryption_t encryption; /* To encrypt or not to encrypt... */
-#if defined(HAVE_LAUNCHD) || defined(HAVE_SYSTEMD)
+#if defined(HAVE_ONDEMAND)
int on_demand; /* Is this a socket from launchd/systemd? */
-#endif /* HAVE_LAUNCHD || HAVE_SYSTEMD */
+#endif /* HAVE_ONDEMAND */
} cupsd_listener_t;