diff options
author | msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2015-08-31 15:00:45 +0000 |
---|---|---|
committer | msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2015-08-31 15:00:45 +0000 |
commit | f495e905dd39afc788246388a88077abd2767d86 (patch) | |
tree | 04eb01b12c5e94fa85c6bf47446949db995866c8 /scheduler/log.c | |
parent | 0b2b24c55848bdb2fb2e92006cf28eb545f97389 (diff) | |
download | cups-f495e905dd39afc788246388a88077abd2767d86.tar.gz |
Fix another journald issue, and partially revert the systemd change so that
CUPS 2.1 builds with systemd support on RHEL 7.
git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@12857 a1ca3aef-8c08-0410-bb20-df032aa958be
Diffstat (limited to 'scheduler/log.c')
-rw-r--r-- | scheduler/log.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scheduler/log.c b/scheduler/log.c index c4ef0329f..fce8797c8 100644 --- a/scheduler/log.c +++ b/scheduler/log.c @@ -637,7 +637,7 @@ cupsdLogJob(cupsd_job_t *job, /* I - Job */ #elif defined(HAVE_SYSTEMD_SD_JOURNAL_H) if (!strcmp(ErrorLog, "syslog")) { - cupsd_printer_t *printer = job ? (job->printer ? job->printer : (job->dest ? cupsdFindDest(job->dest)) : NULL) : NULL; + cupsd_printer_t *printer = job ? (job->printer ? job->printer : (job->dest ? cupsdFindDest(job->dest) : NULL)) : NULL; static const char * const job_states[] = { /* job-state strings */ "Pending", |