Fixed build for CUPS 1.4.

OpenPrinting · Feb 10, 2015 · 1404e46 · 1404e46
1 parent f91852b
commit 1404e46
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/NEWS b/NEWS
@@ -1,6 +1,14 @@
 NEWS
 ----
 
+New in 1.9.72:
+
+* Removed private CANCEL_DOCUMENT, GET_DOCUMENT_ATTRIBUTES,
+  GET_DOCUMENTS, DELETE_DOCUMENT, SET_DOCUMENT_ATTRIBUTES IPP
+  operation constants.
+* Fixed build for CUPS 1.4 by making several constants conditional on
+  CUPS >= 1.5.
+
 New in 1.9.71:
 
 * Fixes for cups.IPP_JOB_CANCELED, cups.IPP_ERROR_JOB_CANCELED,

diff --git a/cupsmodule.c b/cupsmodule.c
@@ -1347,8 +1347,10 @@ initcups (void)
   INT_16_CONSTANT (IPP_STATUS_ERROR_CUPS_AUTHENTICATION_CANCELED,
 		   IPP_AUTHENTICATION_CANCELED);
   INT_16_CONSTANT (IPP_STATUS_ERROR_CUPS_PKI, IPP_PKI_ERROR);
+#if CUPS_VERSION_MAJOR > 1 || (CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR >= 5)
   INT_16_CONSTANT (IPP_STATUS_ERROR_CUPS_UPGRADE_REQUIRED,
 		   IPP_UPGRADE_REQUIRED);
+#endif /* CUPS >= 1.5 */
 
   // IPP states
   /* Also define legacy names */
@@ -1443,17 +1445,12 @@ initcups (void)
   INT_IPP_OP_CONSTANT (RESUME_JOB);
   INT_IPP_OP_CONSTANT (PROMOTE_JOB);
   INT_IPP_OP_CONSTANT (SCHEDULE_JOB_AFTER);
-  INT_IPP_OP_CONSTANT (CANCEL_DOCUMENT);
-  INT_IPP_OP_CONSTANT (GET_DOCUMENT_ATTRIBUTES);
-  INT_IPP_OP_CONSTANT (GET_DOCUMENTS);
-  INT_IPP_OP_CONSTANT (DELETE_DOCUMENT);
-  INT_IPP_OP_CONSTANT (SET_DOCUMENT_ATTRIBUTES);
+#if CUPS_VERSION_MAJOR > 1 || (CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR >= 6)
   INT_IPP_OP_CONSTANT (CANCEL_JOBS);
   INT_IPP_OP_CONSTANT (CANCEL_MY_JOBS);
   INT_IPP_OP_CONSTANT (RESUBMIT_JOB);
   INT_IPP_OP_CONSTANT (CLOSE_JOB);
   INT_IPP_OP_CONSTANT (IDENTIFY_PRINTER);
-#if CUPS_VERSION_MAJOR > 1 || (CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR >= 6)
   INT_IPP_OP_CONSTANT (VALIDATE_DOCUMENT);
   INT_IPP_OP_CONSTANT (SEND_HARDCOPY_DOCUMENT);
 #endif /* CUPS >= 1.6 */