Attachment 12727 Details for Bug 12183 – additional patch for 4.5 and 4.4

[patch] additional patch for 4.5 and 4.4

0001-printing-Fix-building-with-CUPS-version-older-than-1.patch (text/plain), 1023 bytes, created by Andreas Schneider on 2016-12-06 09:06:17 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Andreas Schneider

Created: 2016-12-06 09:06:17 UTC

Size: 1023 bytes

patch

obsolete

>From 9a6163febb7788211a7f54ee974c4e3a580884d5 Mon Sep 17 00:00:00 2001
>From: Andreas Schneider <asn@samba.org>
>Date: Tue, 6 Dec 2016 09:44:28 +0100
>Subject: [PATCH] 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@samba.org>
>Reviewed-by: Karolin Seeger <kseeger@samba.org>
>---
> source3/printing/print_cups.c | 6 ++++++
> 1 file changed, 6 insertions(+)
>
>diff --git a/source3/printing/print_cups.c b/source3/printing/print_cups.c
>index 673a150941e..7c4d35d6d34 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
>-- 
>2.11.0
>

Flags:

kseeger: review+

Actions: View

Attachments on bug 12183: 12648 | 12649 | 12720 | 12727