[SCM] Samba Shared Repository - branch master updated

[Andreas Schneider]

The branch, master has been updated
       via  a3add01 printing: Fix building with CUPS version older than 1.7
      from  4e32944 ctdb: Add new helper ctdb_etcd_lock

https://git.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit a3add017e4c6de04c46ea2e5d65be6ad11c059a3
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(master): Andreas Schneider <asn at cryptomilk.org>
    Autobuild-Date(master): Tue Dec  6 13:54:28 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