Merge changes from CUPS 1.4svn-r7961.

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

diff --git a/cups/backend.h b/cups/backend.h
index f35d98c76f80b2d363dfa13048b91124b4129c99..fc2cd97ee429a1644c75215665b8d513ef9099a2 100644 (file)
--- a/cups/backend.h
+++ b/cups/backend.h
@@ -1,25 +1,16 @@
 /*
- * "$Id: backend.h 177 2006-06-21 00:20:03Z jlovell $"
+ * "$Id: backend.h 7810 2008-07-29 01:11:15Z mike $"
  *
  *   Backend definitions for the Common UNIX Printing System (CUPS).
  *
+ *   Copyright 2007-2008 by Apple Inc.
  *   Copyright 1997-2005 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  *
  *   This file is subject to the Apple OS-Developed Software exception.
  */
@@ -28,11 +19,18 @@
 #  define _CUPS_BACKEND_H_
 
 
+/*
+ * Include necessary headers...
+ */
+
+#  include "versioning.h"
+
+
 /*
  * Constants...
  */
 
-typedef enum cups_backend_e            /**** Backend exit codes ****/
+enum cups_backend_e                    /**** Backend exit codes ****/
 {
   CUPS_BACKEND_OK = 0,                 /* Job completed successfully */
   CUPS_BACKEND_FAILED = 1,             /* Job failed, use error-policy */
@@ -40,18 +38,27 @@ typedef enum cups_backend_e         /**** Backend exit codes ****/
   CUPS_BACKEND_HOLD = 3,               /* Job failed, hold job */
   CUPS_BACKEND_STOP = 4,               /* Job failed, stop queue */
   CUPS_BACKEND_CANCEL = 5              /* Job failed, cancel job */
-} cups_backend_t;
+};
+typedef enum cups_backend_e cups_backend_t;
+                                       /**** Backend exit codes ****/
 
 
 /*
  * Prototypes...
  */
 
-extern const char      *cupsBackendDeviceURI(char **argv);
-
+extern const char      *cupsBackendDeviceURI(char **argv) _CUPS_API_1_2;
+extern void            cupsBackendReport(const char *device_scheme,
+                                         const char *device_uri,
+                                         const char *device_make_and_model,
+                                         const char *device_info,
+                                         const char *device_id,
+                                         const char *device_location)
+                                         _CUPS_API_1_4;
+                                         
 
 #endif /* !_CUPS_BACKEND_H_ */
 
 /*
- * End of "$Id: backend.h 177 2006-06-21 00:20:03Z jlovell $".
+ * End of "$Id: backend.h 7810 2008-07-29 01:11:15Z mike $".
  */