Load cups into easysw/current.

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

diff --git a/cups/cups.h b/cups/cups.h
index 9d4fe2fa9ed2bd22f2dfdcf086e464dad7be1e23..befa0a39582ad53968949c6ac55413be1d61e0a8 100644 (file)
--- a/cups/cups.h
+++ b/cups/cups.h
@@ -1,25 +1,16 @@
 /*
- * "$Id: cups.h 5138 2006-02-21 10:49:06Z mike $"
+ * "$Id: cups.h 6658 2007-07-13 01:13:26Z mike $"
  *
  *   API definitions for the Common UNIX Printing System (CUPS).
  *
- *   Copyright 1997-2006 by Easy Software Products.
+ *   Copyright 2007 by Apple Inc.
+ *   Copyright 1997-2007 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.
  */
@@ -31,6 +22,13 @@
  * Include necessary headers...
  */
 
+#  include <sys/types.h>
+#  if defined(WIN32) && !defined(__CUPS_SSIZE_T_DEFINED)
+#    define __CUPS_SSIZE_T_DEFINED
+/* Windows does not support the ssize_t type, so map it to off_t... */
+typedef off_t ssize_t;                 /* @private@ */
+#  endif /* WIN32 && !__CUPS_SSIZE_T_DEFINED */
+
 #  include "ipp.h"
 #  include "ppd.h"
 #  include "language.h"
@@ -61,10 +59,10 @@ extern "C" {
  * Constants...
  */
 
-#  define CUPS_VERSION         1.0190
+#  define CUPS_VERSION         1.0300
 #  define CUPS_VERSION_MAJOR   1
-#  define CUPS_VERSION_MINOR   2
-#  define CUPS_VERSION_PATCH   -10
+#  define CUPS_VERSION_MINOR   3
+#  define CUPS_VERSION_PATCH   0
 #  define CUPS_DATE_ANY                -1
 
 
@@ -99,7 +97,9 @@ enum cups_ptype_e                     /* Not a typedef'd enum so we can OR */
   CUPS_PRINTER_DELETE = 0x100000,      /* Delete printer @since CUPS 1.2@ */
   CUPS_PRINTER_NOT_SHARED = 0x200000,  /* Printer is not shared @since CUPS 1.2@ */
   CUPS_PRINTER_AUTHENTICATED = 0x400000,/* Printer requires authentication @since CUPS 1.2@ */
-  CUPS_PRINTER_OPTIONS = 0x66fffc      /* ~(CLASS | REMOTE | IMPLICIT) */
+  CUPS_PRINTER_COMMANDS = 0x800000,    /* Printer supports maintenance commands @since CUPS 1.2@ */
+  CUPS_PRINTER_DISCOVERED = 0x1000000, /* Printer was automatically discovered and added @since CUPS 1.3@ */
+  CUPS_PRINTER_OPTIONS = 0x6fffc       /* ~(CLASS | REMOTE | IMPLICIT | DEFAULT | FAX | REJECTING | DELETE | NOT_SHARED | AUTHENTICATED | COMMANDS | DISCOVERED) */
 };
 
 typedef const char *(*cups_password_cb_t)(const char *);
@@ -179,10 +179,10 @@ extern void               cupsEncodeOptions(ipp_t *ipp, int num_options,
 extern void            cupsFreeOptions(int num_options, cups_option_t *options);
 extern const char      *cupsGetOption(const char *name, int num_options,
                                       cups_option_t *options);
-extern int             cupsParseOptions(const char *arg, int num_options,
-                                        cups_option_t **options);
 extern int             cupsMarkOptions(ppd_file_t *ppd, int num_options,
                                        cups_option_t *options);
+extern int             cupsParseOptions(const char *arg, int num_options,
+                                        cups_option_t **options);
 
 extern const char      *cupsGetPassword(const char *prompt);
 extern const char      *cupsServer(void);
@@ -231,8 +231,23 @@ extern void                cupsEncodeOptions2(ipp_t *ipp, int num_options,
 extern const char      *cupsLastErrorString(void);
 extern char            *cupsNotifySubject(cups_lang_t *lang, ipp_t *event);
 extern char            *cupsNotifyText(cups_lang_t *lang, ipp_t *event);
+extern int             cupsRemoveOption(const char *name, int num_options,
+                                        cups_option_t **options);
 extern cups_file_t     *cupsTempFile2(char *filename, int len);
 
+/**** New in CUPS 1.3 ****/
+extern ipp_t           *cupsDoIORequest(http_t *http, ipp_t *request,
+                                        const char *resource, int infile,
+                                        int outfile);
+extern char            *cupsGetServerPPD(http_t *http, const char *name);
+extern int             cupsRemoveDest(const char *name,
+                                      const char *instance,
+                                      int num_dests, cups_dest_t **dests);
+extern void            cupsSetDefaultDest(const char *name,
+                                          const char *instance,
+                                          int num_dests,
+                                          cups_dest_t *dests);
+
 
 #  ifdef __cplusplus
 }
@@ -241,5 +256,5 @@ extern cups_file_t  *cupsTempFile2(char *filename, int len);
 #endif /* !_CUPS_CUPS_H_ */
 
 /*
- * End of "$Id: cups.h 5138 2006-02-21 10:49:06Z mike $".
+ * End of "$Id: cups.h 6658 2007-07-13 01:13:26Z mike $".
  */