[SCM] Samba Shared Repository - branch v4-5-test updated
Karolin Seeger
kseeger at samba.org
Tue Dec 6 13:22:07 UTC 2016
The branch, v4-5-test has been updated
via 343718c printing: Fix building with CUPS version older than 1.7
from d869ba0 VERSION: Bump version up to 4.5.3...
https://git.samba.org/?p=samba.git;a=shortlog;h=v4-5-test
- Log -----------------------------------------------------------------
commit 343718c30f372f558f90286cb10be7409b7bfad9
Author: Andreas Schneider <asn at samba.org>
Date: Tue Dec 6 09:44:28 2016 +0100
printing: Fix building with CUPS version older than 1.7
BUG: https://bugzilla.samba.org/show_bug.cgi?id=12183
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Karolin Seeger <kseeger at samba.org>
Autobuild-User(v4-5-test): Karolin Seeger <kseeger at samba.org>
Autobuild-Date(v4-5-test): Tue Dec 6 14:21:49 CET 2016 on sn-devel-144
-----------------------------------------------------------------------
Summary of changes:
source3/printing/print_cups.c | 6 ++++++
1 file changed, 6 insertions(+)
Changeset truncated at 500 lines:
diff --git a/source3/printing/print_cups.c b/source3/printing/print_cups.c
index 673a150..7c4d35d 100644
--- a/source3/printing/print_cups.c
+++ b/source3/printing/print_cups.c
@@ -31,6 +31,12 @@
#ifdef HAVE_CUPS
#include <cups/cups.h>
#include <cups/language.h>
+#include <cups/http.h>
+
+/* CUPS prior to version 1.7 doesn't have HTTP_URI_STATUS_OK */
+#if (CUPS_VERSION_MAJOR == 1) && (CUPS_VERSION_MINOR < 7)
+#define HTTP_URI_STATUS_OK HTTP_URI_OK
+#endif
#if (CUPS_VERSION_MAJOR > 1) || (CUPS_VERSION_MINOR > 5)
#define HAVE_CUPS_1_6 1
--
Samba Shared Repository
More information about the samba-cvs
mailing list