Load cups into easysw/current.

[thirdparty/cups.git] / cups / ipp.h

diff --git a/cups/ipp.h b/cups/ipp.h
index 6435a0eca79d43fde2105994d6a2e81b8d778835..32b578fc767702db3665a0bb4ac8e7bde6132896 100644 (file)
--- a/cups/ipp.h
+++ b/cups/ipp.h
@@ -1,5 +1,5 @@
 /*
- * "$Id: ipp.h 5138 2006-02-21 10:49:06Z mike $"
+ * "$Id: ipp.h 5878 2006-08-24 15:55:42Z mike $"
  *
  *   Internet Printing Protocol definitions for the Common UNIX Printing
  *   System (CUPS).
@@ -172,10 +172,11 @@ typedef enum ipp_jstate_e         /**** Job States.... */
   IPP_JOB_HELD,                                /* Job is held for printing */
   IPP_JOB_PROCESSING,                  /* Job is currently printing */
   IPP_JOB_STOPPED,                     /* Job has been stopped */
-  IPP_JOB_CANCELLED,                   /* Job has been cancelled */
+  IPP_JOB_CANCELED,                    /* Job has been canceled */
   IPP_JOB_ABORTED,                     /* Job has aborted due to error */
   IPP_JOB_COMPLETED                    /* Job has completed successfully */
 } ipp_jstate_t;
+#define IPP_JOB_CANCELLED IPP_JOB_CANCELED
 
 typedef enum ipp_pstate_e              /**** Printer States.... */
 {
@@ -304,10 +305,11 @@ typedef enum ipp_status_e         /**** IPP status codes... ****/
   IPP_TEMPORARY_ERROR,                 /* server-error-temporary-error */
   IPP_NOT_ACCEPTING,                   /* server-error-not-accepting-jobs */
   IPP_PRINTER_BUSY,                    /* server-error-busy */
-  IPP_ERROR_JOB_CANCELLED,             /* server-error-job-canceled */
+  IPP_ERROR_JOB_CANCELED,              /* server-error-job-canceled */
   IPP_MULTIPLE_JOBS_NOT_SUPPORTED,     /* server-error-multiple-document-jobs-not-supported */
   IPP_PRINTER_IS_DEACTIVATED           /* server-error-printer-is-deactivated */
 } ipp_status_t;
+#define IPP_ERROR_JOB_CANCELLED IPP_ERROR_JOB_CANCELED
 
 typedef unsigned char ipp_uchar_t;     /**** Unsigned 8-bit integer/character ****/
 
@@ -497,5 +499,5 @@ extern ipp_state_t  ippWriteIO(void *dst, ipp_iocb_t cb, int blocking,
 #endif /* !_CUPS_IPP_H_ */
 
 /*
- * End of "$Id: ipp.h 5138 2006-02-21 10:49:06Z mike $".
+ * End of "$Id: ipp.h 5878 2006-08-24 15:55:42Z mike $".
  */