Load cups into easysw/current.

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

diff --git a/cups/ipp.h b/cups/ipp.h
index 57d43f72a9985fdd4e61aaded3b21a2d868840d6..a374487765dbe4bdc7011b2451f1d25023ebb4a6 100644 (file)
--- a/cups/ipp.h
+++ b/cups/ipp.h
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: ipp.h 6503 2007-05-01 23:06:44Z 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.... */
 {
@@ -253,7 +254,8 @@ typedef enum ipp_op_e                       /**** IPP operations... ****/
   CUPS_GET_DEVICES,                    /* Get a list of supported devices */
   CUPS_GET_PPDS,                       /* Get a list of supported drivers */
   CUPS_MOVE_JOB,                       /* Move a job to a different printer */
-  CUPS_AUTHENTICATE_JOB                        /* Authenticate a job @since CUPS 1.2@ */
+  CUPS_AUTHENTICATE_JOB,               /* Authenticate a job @since CUPS 1.2@ */
+  CUPS_GET_PPD                         /* Get a PPD file @since CUPS 1.3@ */
 } ipp_op_t;
 
 /* Old names for the operations */
@@ -270,7 +272,8 @@ typedef enum ipp_status_e           /**** IPP status codes... ****/
   IPP_OK_TOO_MANY_EVENTS,              /* successful-ok-too-many-events */
   IPP_OK_BUT_CANCEL_SUBSCRIPTION,      /* successful-ok-but-cancel-subscription */
   IPP_OK_EVENTS_COMPLETE,              /* successful-ok-events-complete */
-  IPP_REDIRECTION_OTHER_SITE = 0x300,  /*  */
+  IPP_REDIRECTION_OTHER_SITE = 0x200,  /*  */
+  CUPS_SEE_OTHER = 0x280,              /* cups-see-other */
   IPP_BAD_REQUEST = 0x0400,            /* client-error-bad-request */
   IPP_FORBIDDEN,                       /* client-error-forbidden */
   IPP_NOT_AUTHENTICATED,               /* client-error-not-authenticated */
@@ -304,10 +307,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 +501,5 @@ extern ipp_state_t  ippWriteIO(void *dst, ipp_iocb_t cb, int blocking,
 #endif /* !_CUPS_IPP_H_ */
 
 /*
- * End of "$Id$".
+ * End of "$Id: ipp.h 6503 2007-05-01 23:06:44Z mike $".
  */